TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not use Logical operators

Browse Source
This commit is contained in:
Manuel Raynaud
2014-03-10 11:21:34 +01:00
parent 978909ac5a
commit fca33e942c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Log/Tlog.php
View File

@@ -620,7 +620,7 @@ class Tlog Implements LoggerInterface
// we are sometimes in functions = no class available: avoid php warning here
$className = $hop['class'];
if (! empty($className) and ($className == ltrim(__CLASS__,'\\') or strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) {
if (! empty($className) && ($className == ltrim(__CLASS__,'\\') || strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) {
$origine['line'] = $hop['line'];
$origine['file'] = $hop['file'];
break;
@@ -632,10 +632,10 @@ class Tlog Implements LoggerInterface
$origine['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
if(isset($prevHop['function']) and
$prevHop['function'] !== 'include' and
$prevHop['function'] !== 'include_once' and
$prevHop['function'] !== 'require' and
if(isset($prevHop['function']) &&
$prevHop['function'] !== 'include' &&
$prevHop['function'] !== 'include_once' &&
$prevHop['function'] !== 'require' &&
$prevHop['function'] !== 'require_once') {
$origine['function'] = $prevHop['function'];