mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00
Code Issues Releases Wiki Activity

Fix for save_pref() messages not displaying under some circumstances.

Browse Source
This commit is contained in:
Cameron
2014-02-06 18:22:44 -08:00
parent 6b1a2c375c
commit f100297108
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1661,6 +1661,11 @@ Inverse 10 <span class="badge badge-inverse">10</span>
{
$slng = e107::getLanguage();
$languages = $slng->installed();//array('English','French');
$langSubs = explode("\n", e107::getPref('multilanguage_subdomain'));
// print_a($langSubs);
if(count($languages) > 1)
{
$c = 0;
@@ -1671,10 +1676,10 @@ Inverse 10 <span class="badge badge-inverse">10</span>
if($lng == e_LANGUAGE)
{
$checked = "<i class='icon-ok'></i> ";
$checked = $tp->toGlyph('ok')." ";
$link = '#';
}
elseif(e107::getPref('multilanguage_subdomain'))
elseif(!empty($langSubs) && in_array(e_DOMAIN,$langSubs))
{
$code = ($lng == e107::getPref('sitelanguage')) ? 'www' : $code;
$link = str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_URL); // includes query string

6
e107_handlers/pref_class.php
View File

@@ -492,10 +492,10 @@ class e_pref extends e_front_model
*
* @param boolean $from_post merge post data
* @param boolean $force
* @param boolean $session_messages use session messages
* @param mixed $session_messages null: normal messages displayed, true: session messages used, false: no messages displayed.
* @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 = null)
{
global $pref;
if(!$this->prefid)
@@ -586,7 +586,7 @@ class e_pref extends e_front_model
$logId = 'PREFS_01';
}
$log->addSuccess('Settings successfully saved.', $session_messages);
$log->addSuccess('Settings successfully saved.', ($session_messages === null || $session_messages === true));
$log->save($logId);
// if(!$disallow_logs) $log->logSuccess('Settings successfully saved.', true, $session_messages)->flushMessages($logId, E_LOG_INFORMATIVE, '', $this->prefid);