1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 09:10:23 +02:00

PHP7 fixes

This commit is contained in:
Cameron
2019-01-18 14:07:59 -08:00
parent 221f12088b
commit 27d12c0ab6
3 changed files with 20 additions and 7 deletions

View File

@@ -200,9 +200,15 @@ class e_tohtml_linkwords
if(is_string($this->area_opts))
{
$this->area_opts = e107::unserialize($this->area_opts);
}
if (!$this->lw_enabled || !count($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas
}
if($this->area_opts === null)
{
$this->area_opts = array();
}
if (!$this->lw_enabled || empty($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas
// Split up by HTML tags and process the odd bits here
$ptext = "";

View File

@@ -92,11 +92,11 @@ e107::getLanguage()->bcDefs($bcDefs);
$mode = varset($parm['mode']);
if($mode === 'usersettings' && e_PAGE === 'usersettings.php')
if($mode === 'usersettings' && defset('e_PAGE') === 'usersettings.php')
{
return 'active';
}
elseif($mode === 'profile' && e_PAGE === 'user.php')
elseif($mode === 'profile' && defset('e_PAGE') === 'user.php')
{
return 'active';
}