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

Fixes #3815 - deftrue not found issue.

Browse Source
This commit is contained in:
Cameron
2019-05-25 11:53:29 -07:00
parent 4b44128cdb
commit f1081c2b21
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
class2.php
View File

@@ -2371,6 +2371,22 @@ class error_handler
} }
} }
/**
* Deftrue function independent of core function.
* @param $value
* @return bool
*/
private function deftrue($value)
{
if (defined($value) && constant($value))
{
return true;
}
return false;
}
/** /**
* @param $type * @param $type
* @param $message * @param $message
@@ -2389,7 +2405,7 @@ class error_handler
case E_DEPRECATED: case E_DEPRECATED:
// case E_STRICT: // case E_STRICT:
if ($startup_error || deftrue('E107_DBG_ALLERRORS') || deftrue('E107_DBG_ERRBACKTRACE')) if ($startup_error || $this->deftrue('E107_DBG_ALLERRORS') || $this->deftrue('E107_DBG_ERRBACKTRACE'))
{ {
@@ -2411,7 +2427,7 @@ class error_handler
} }
break; break;
case E_WARNING: case E_WARNING:
if ($startup_error || deftrue('E107_DBG_BASIC') || deftrue('E107_DBG_ERRBACKTRACE')) if ($startup_error || $this->deftrue('E107_DBG_BASIC') || $this->deftrue('E107_DBG_ERRBACKTRACE'))
{ {
// $error['short'] = "Warning: {$message}, Line {$line} of {$file}<br />\n"; // $error['short'] = "Warning: {$message}, Line {$line} of {$file}<br />\n";
$error['short'] = "<span class='label label-".$this->color[$type]."'>".$this->label[$type]."</span> {$message}, Line <mark>{$line}</mark> of {$file}<br />\n"; $error['short'] = "<span class='label label-".$this->color[$type]."'>".$this->label[$type]."</span> {$message}, Line <mark>{$line}</mark> of {$file}<br />\n";