mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Potential fix for install issue.

Browse Source
This commit is contained in:
Cameron
2013-03-16 03:58:12 -07:00
parent a117257dbf
commit b38effe46e
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
class2.php
View File

@@ -631,6 +631,22 @@ define('SITEDISCLAIMER', $tp->toHTML($pref['sitedisclaimer'], '', 'emotes_off,de
define('SITECONTACTINFO', $tp->toHTML($pref['sitecontactinfo'], true, 'emotes_off,defs')); define('SITECONTACTINFO', $tp->toHTML($pref['sitecontactinfo'], true, 'emotes_off,defs'));
define('SITEEMAIL', vartrue($pref['replyto_email'],$pref['siteadminemail'])); define('SITEEMAIL', vartrue($pref['replyto_email'],$pref['siteadminemail']));
if(is_array($pref['xurl']))
{
define('XURL_FACEBOOK', vartrue($pref['xurl']['facebook'], false));
define('XURL_TWITTER', vartrue($pref['xurl']['twitter'], false));
define('XURL_YOUTUBE', vartrue($pref['xurl']['youtube'], false));
define('XURL_GOOGLE', vartrue($pref['xurl']['google'], false));
define('XURL_LINKEDIN', vartrue($pref['xurl']['linkedin'], false));
}
else
{
define('XURL_FACEBOOK',false);
define('XURL_TWITTER', false);
define('XURL_YOUTUBE', false);
define('XURL_GOOGLE', false);
define('XURL_LINKEDIN', false);
}
/* Withdrawn 0.8 /* Withdrawn 0.8
// legacy module.php file loading. // legacy module.php file loading.

19
e107_handlers/e107_class.php
View File

@@ -2984,25 +2984,6 @@ 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'));
} }
$p = e107::getPref();
if(varset($p['xurl']) && is_array($p['xurl'])) // avoid fatal errors if pref missing.
{
$pref = $p['xurl'];
define('XURL_FACEBOOK', vartrue($pref['facebook'],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));
}
else
{
define('XURL_FACEBOOK',false);
define('XURL_TWITTER', false);
define('XURL_YOUTUBE', false);
define('XURL_GOOGLE', false);
define('XURL_LINKEDIN', false);
}
return $this; return $this;
} }