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

Fix for prefs issue.

Browse Source
This commit is contained in:
Cameron
2013-03-13 00:08:23 -07:00
parent 064528e754
commit 4ece98ef90
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/update_routines.php
View File

@@ -223,13 +223,10 @@ function update_check()
//-------------------------------------------- //--------------------------------------------
function update_core_prefs($type='') function update_core_prefs($type='')
{ {
$pref = e107::getPref(); global $pref, $e107info; // $pref must be kept as global
global $e107info;
$admin_log = e107::getAdminLog(); $admin_log = e107::getAdminLog();
$do_save = FALSE; $do_save = FALSE;
$should = get_default_prefs(); $should = get_default_prefs();
$just_check = $type == 'do' ? FALSE : TRUE; // TRUE if we're just seeing if an update is needed $just_check = $type == 'do' ? FALSE : TRUE; // TRUE if we're just seeing if an update is needed

17
e107_handlers/e107_class.php
View File

@@ -2968,14 +2968,17 @@ class e107
define('e_LOGIN', SITEURL.(file_exists(e_BASE.'customlogin.php') ? 'customlogin.php' : 'login.php')); define('e_LOGIN', SITEURL.(file_exists(e_BASE.'customlogin.php') ? 'customlogin.php' : 'login.php'));
} }
$pref = e107::getPref('xurl'); $p = e107::getPref();
define('XURL_FACEBOOK', vartrue($pref['facebook'],false)); if(varset($p['xurl']) && is_array($p['xurl']))
define('XURL_TWITTER', vartrue($pref['twitter'],false)); {
define('XURL_YOUTUBE', vartrue($pref['youtube'],false)); $pref = $p['xurl'];
define('XURL_GOOGLE', vartrue($pref['google'],false)); define('XURL_FACEBOOK', vartrue($pref['facebook'],false));
define('XURL_LINKEDIN', vartrue($pref['linkedin'],false)); define('XURL_TWITTER', vartrue($pref['twitter'],false));
define('XURL_YOUTUBE', vartrue($pref['youtube'],false));
define('XURL_GOOGLE', vartrue($pref['google'],false));
define('XURL_LINKEDIN', vartrue($pref['linkedin'],false));
}
return $this; return $this;
} }