1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +02:00

Upgrade Fixes and notice removals.

This commit is contained in:
Cameron
2012-12-07 15:16:42 -08:00
parent 1062988bba
commit df2a903e62
10 changed files with 194 additions and 156 deletions

View File

@@ -105,8 +105,14 @@ class override {
}
}
$tmp = (isset($this->functions[$override]) && strpos($this->functions[$override],"::")) ? explode("::",$this->functions[$override]) : $this->functions[$override];
if($override && isset($this->functions[$override]))
{
$tmp = (strpos($this->functions[$override],"::")) ? explode("::",$this->functions[$override]) : $this->functions[$override];
}
else
{
$tmp = false;
}
if(is_array($tmp) && class_exists($tmp[0]))
{
$cl = new $tmp[0];
@@ -116,7 +122,7 @@ class override {
}
}
if (function_exists($this->functions[$override]))
if ($override && isset($this->functions[$override]) && function_exists($this->functions[$override]))
{
return $this->functions[$override];