mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 10:36:20 +02:00
Code Issues Releases Wiki Activity

Fix for 'silent' pref save. Removed deprecated notice from XML class.

Browse Source
This commit is contained in:
Cameron
2014-01-21 05:12:58 -08:00
parent 2f5337703b
commit dd57ec8db8
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/pref_class.php
View File

@ -492,7 +492,7 @@ class e_pref extends e_front_model
* *
* @param boolean $from_post merge post data * @param boolean $from_post merge post data
* @param boolean $force * @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 * @return boolean|integer 0 - no change, true - saved, false - error
*/ */
public function save($from_post = true, $force = false, $session_messages = false) 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'; $logId = 'PREFS_01';
} }
$log->addSuccess('Settings successfully saved.',true); $log->addSuccess('Settings successfully saved.', $session_messages);
$log->save($logId); $log->save($logId);
// if(!$disallow_logs) $log->logSuccess('Settings successfully saved.', true, $session_messages)->flushMessages($logId, E_LOG_INFORMATIVE, '', $this->prefid); // if(!$disallow_logs) $log->logSuccess('Settings successfully saved.', true, $session_messages)->flushMessages($logId, E_LOG_INFORMATIVE, '', $this->prefid);

10
e107_handlers/xml_class.php
View File

@ -423,20 +423,14 @@ class xmlClass
} }
/** /**
* DEPRECATED * Get Remote XML file contents
* Get Remote file contents
* use setOptArrayTags above if you require a consistent array result by in 1 item or many. * 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 string $address
* @param integer $timeout [optional] seconds * @param integer $timeout [optional] seconds
* @return string * @return string
*/ */
function getRemoteFile($address, $timeout = 10, $postData=null) 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(); $_file = e107::getFile();
$this->xmlFileContents = $_file->getRemoteContent($address, array('timeout' => $timeout, 'post' => $postData)); $this->xmlFileContents = $_file->getRemoteContent($address, array('timeout' => $timeout, 'post' => $postData));
$this->error = $_file->error; $this->error = $_file->error;