1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-13 09:01:59 +02:00

e107::getMessageHandler() renamed to e107::getMessage()

This commit is contained in:
secretr 2009-09-29 17:43:13 +00:00
parent f196470f49
commit cd905122eb
4 changed files with 33 additions and 22 deletions

View File

@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| <EFBFBD>Steve Dunstan 2001-2002
| Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/comment.php,v $
| $Revision: 1.5 $
| $Date: 2009-09-19 15:30:47 $
| $Revision: 1.6 $
| $Date: 2009-09-29 17:43:13 $
| $Author: secretr $
+----------------------------------------------------------------------------+
*/

View File

@ -9,8 +9,8 @@
* URL Management
*
* $Source: /cvs_backup/e107_0.8/e107_admin/eurl.php,v $
* $Revision: 1.10 $
* $Date: 2009-09-25 20:20:23 $
* $Revision: 1.11 $
* $Date: 2009-09-29 17:43:13 $
* $Author: secretr $
*/
@ -73,7 +73,7 @@ class admin_eurl_config {
function renderPage()
{
$emessage = e107::getMessageHandler();
$emessage = e107::getMessage();
$empty = "
<tr>
<td colspan='2'>".LAN_EURL_EMPTY."</td>
@ -272,7 +272,7 @@ class admin_eurl_config {
{
if(save_prefs())
{
e107::getMessageHandler()->add(LAN_EURL_AUTOSAVE);
e107::getMessage()->add(LAN_EURL_AUTOSAVE);
}
}

View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $
| $Revision: 1.26 $
| $Date: 2009-09-21 12:52:52 $
| $Revision: 1.27 $
| $Date: 2009-09-29 17:43:13 $
| $Author: secretr $
+----------------------------------------------------------------------------+
*/
@ -64,7 +64,7 @@ class comment
}
//FIXME - e_REQUEST_URI?
//e_SELF."?".e_QUERY
$text = "\n<div id='e-comment-form' style='text-align:center'>\n".e107::getMessageHandler()->render('postcomment', true, false, false);//temporary here
$text = "\n<div id='e-comment-form' style='text-align:center'>\n".e107::getMessage()->render('postcomment', true, false, false);//temporary here
$text .= "<form method='post' action='".str_replace('http:', '', $_SERVER['REQUEST_URI'])."' id='dataform' >\n<table style='width:100%'>";
if ($pref['nested_comments'])
{
@ -457,7 +457,7 @@ class comment
if (!($inserted_id = $sql->db_Insert("comments", $edata_li)))
{
//echo "<b>".COMLAN_323."</b> ".COMLAN_11;
e107::getMessageHandler()->addStack(COMLAN_11, 'postcomment', E_MESSAGE_ERROR);
e107::getMessage()->addStack(COMLAN_11, 'postcomment', E_MESSAGE_ERROR);
}
else

View File

@ -9,8 +9,8 @@
* e107 Main
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
* $Revision: 1.51 $
* $Date: 2009-09-19 15:27:26 $
* $Revision: 1.52 $
* $Date: 2009-09-29 17:43:13 $
* $Author: secretr $
*/
@ -58,12 +58,6 @@ class e107
*/
protected static $_sc_core_loaded = false;
/**
* message handler included check
* @var boolean
*/
protected static $_message_included = false;
/**
* Singleton instance
* Allow class extends - override {@link getInstance()}
@ -795,16 +789,33 @@ class e107
*
* @return eMessage
*/
public static function getMessageHandler()
public static function getMessage()
{
if(!self::$_message_included)
static $included = false;
if(!$included)
{
e107_require_once(e_HANDLER.'message_handler.php');
self::$_message_included = true;
$included = true;
}
return eMessage::getInstance();
}
/**
* Retrieve JS Manager singleton object
*
* @return e_jsmanager
*/
public static function getJs()
{
static $included = false;
if(!$included)
{
e107_require_once(e_HANDLER.'js_manager.php');
$included = true;
}
return e_jsmanager::getInstance();
}
/**
* Get core template. Use this method for templates, which are following the
* new template standards: