mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-27 18:00:30 +02:00
Code Issues Releases Wiki Activity

eMessage handler: _mergeSession() renamed to mergeWithSession() and made public accessible

Browse Source
This commit is contained in:
secretr
2009-09-12 18:21:54 +00:00
parent 83a1f7da35
commit cb7ce89b47
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_handlers/message_handler.php
View File

@@ -9,8 +9,8 @@
* Message Handler * Message Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
* $Revision: 1.15 $ * $Revision: 1.16 $
* $Date: 2009-09-10 19:10:32 $ * $Date: 2009-09-12 18:21:54 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -76,7 +76,7 @@ class eMessage
require_once(e_HANDLER.'e107_class.php'); require_once(e_HANDLER.'e107_class.php');
$this->_session_id = e107::getPref('cookie_name', 'e107').'_system_messages'; $this->_session_id = e107::getPref('cookie_name', 'e107').'_system_messages';
$this->reset()->_mergeSession(); $this->reset()->mergeWithSession();
} }
/** /**
@@ -248,7 +248,7 @@ class eMessage
{ {
if($session) if($session)
{ {
$this->_mergeSession(true, $mstack); $this->mergeWithSession(true, $mstack);
} }
$ret = array(); $ret = array();
@@ -388,7 +388,7 @@ class eMessage
* @param boolean $reset * @param boolean $reset
* @return eMessage * @return eMessage
*/ */
protected function _mergeSession($reset = true, $mstack = false) public function mergeWithSession($reset = true, $mstack = false)
{ {
if(is_array($_SESSION[$this->_session_id])) if(is_array($_SESSION[$this->_session_id]))
{ {