mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

e107 class improvement: getMessageHandler() method added (for consistency), getLan() renamed to includeLan()

Browse Source
This commit is contained in:
secretr
2009-09-19 15:27:26 +00:00
parent c6051192b2
commit 64f9020f5d
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
class2.php
View File

@@ -9,8 +9,8 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.144 $ * $Revision: 1.145 $
* $Date: 2009-09-15 13:34:09 $ * $Date: 2009-09-19 15:27:26 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -1876,10 +1876,10 @@ function class_list($uid = '')
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
//DEPRECATED - use e107::getLan(); //DEPRECATED - use e107::includeLan();
function include_lan($path, $force = false) function include_lan($path, $force = false)
{ {
return e107::getLan($path, $force); return e107::includeLan($path, $force);
} }
/* /*

6
e107_admin/newspost.php
View File

@@ -9,8 +9,8 @@
* News Administration * News Administration
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
* $Revision: 1.53 $ * $Revision: 1.54 $
* $Date: 2009-09-14 18:22:15 $ * $Date: 2009-09-19 15:27:25 $
* $Author: secretr $ * $Author: secretr $
*/ */
require_once("../class2.php"); require_once("../class2.php");
@@ -2375,7 +2375,7 @@ class admin_newspost
function show_options() function show_options()
{ {
$e107 = &e107::getInstance(); $e107 = e107::getInstance();
$var['main']['text'] = NWSLAN_44; $var['main']['text'] = NWSLAN_44;
$var['main']['link'] = e_SELF; $var['main']['link'] = e_SELF;

28
e107_handlers/e107_class.php
View File

@@ -9,8 +9,8 @@
* e107 Main * e107 Main
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
* $Revision: 1.50 $ * $Revision: 1.51 $
* $Date: 2009-09-14 18:22:15 $ * $Date: 2009-09-19 15:27:26 $
* $Author: secretr $ * $Author: secretr $
*/ */
@@ -58,6 +58,12 @@ class e107
*/ */
protected static $_sc_core_loaded = false; protected static $_sc_core_loaded = false;
/**
* message handler included check
* @var boolean
*/
protected static $_message_included = false;
/** /**
* Singleton instance * Singleton instance
* Allow class extends - override {@link getInstance()} * Allow class extends - override {@link getInstance()}
@@ -428,7 +434,6 @@ class e107
e107::setRegistry($id, new $class_name()); e107::setRegistry($id, new $class_name());
} }
return self::getRegistry($id); return self::getRegistry($id);
} }
@@ -785,6 +790,21 @@ class e107
return self::getSingleton('e_online', true); return self::getSingleton('e_online', true);
} }
/**
* Retrieve message handler singleton
*
* @return eMessage
*/
public static function getMessageHandler()
{
if(!self::$_message_included)
{
e107_require_once(e_HANDLER.'message_handler.php');
self::$_message_included = true;
}
return eMessage::getInstance();
}
/** /**
* Get core template. Use this method for templates, which are following the * Get core template. Use this method for templates, which are following the
* new template standards: * new template standards:
@@ -911,7 +931,7 @@ class e107
* @param boolean $force * @param boolean $force
* @return string * @return string
*/ */
public static function getLan($path, $force = false) public static function includeLan($path, $force = false)
{ {
global $pref; global $pref;
if (!is_readable($path)) if (!is_readable($path))

8
install_.php
View File

@@ -9,9 +9,9 @@
* Installation file * Installation file
* *
* $Source: /cvs_backup/e107_0.8/install_.php,v $ * $Source: /cvs_backup/e107_0.8/install_.php,v $
* $Revision: 1.41 $ * $Revision: 1.42 $
* $Date: 2009-09-17 13:52:33 $ * $Date: 2009-09-19 15:27:26 $
* $Author: e107coders $ * $Author: secretr $
* *
*/ */
@@ -148,7 +148,7 @@ unset($e107_paths);
function include_lan($path, $force = false) function include_lan($path, $force = false)
{ {
return e107::getLan($path, $force); return e107::includeLan($path, $force);
} }
//obsolete $e107->e107_dirs['INSTALLER'] = "{$installer_folder_name}/"; //obsolete $e107->e107_dirs['INSTALLER'] = "{$installer_folder_name}/";