diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php index 1d258f131..9e6c75259 100644 --- a/e107_handlers/pref_class.php +++ b/e107_handlers/pref_class.php @@ -492,7 +492,7 @@ class e_pref extends e_front_model * * @param boolean $from_post merge post data * @param boolean $force - * @param boolean $session_messages use session messages //FIXME Appears to be ignored on "Settings successfully saved. + * @param boolean $session_messages use session messages * @return boolean|integer 0 - no change, true - saved, false - error */ public function save($from_post = true, $force = false, $session_messages = false) @@ -586,7 +586,7 @@ class e_pref extends e_front_model $logId = 'PREFS_01'; } - $log->addSuccess('Settings successfully saved.',true); + $log->addSuccess('Settings successfully saved.', $session_messages); $log->save($logId); // if(!$disallow_logs) $log->logSuccess('Settings successfully saved.', true, $session_messages)->flushMessages($logId, E_LOG_INFORMATIVE, '', $this->prefid); diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php index 2b202910d..b345b854c 100644 --- a/e107_handlers/xml_class.php +++ b/e107_handlers/xml_class.php @@ -423,20 +423,14 @@ class xmlClass } /** - * DEPRECATED - * Get Remote file contents + * Get Remote XML file contents * use setOptArrayTags above if you require a consistent array result by in 1 item or many. - * @deprecated use e_file::getRemoteContent() instead * @param string $address * @param integer $timeout [optional] seconds * @return string */ function getRemoteFile($address, $timeout = 10, $postData=null) - { - $debug = debug_backtrace(true); - e107::getAdminLog()->addDebug("Deprecated getRemoteFile() method used. Use e_file::getRemoteContent() instead.")->addArray($debug)->save('DEPRECATED',E_LOG_NOTICE); - - + { $_file = e107::getFile(); $this->xmlFileContents = $_file->getRemoteContent($address, array('timeout' => $timeout, 'post' => $postData)); $this->error = $_file->error;