Merged in bugfix/HOR-3379 (pull request #5737)

HOR-3379

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2017-06-22 19:47:01 +00:00
committed by Julio Cesar Laura Avendaño
2 changed files with 16 additions and 13 deletions

View File

@@ -2915,13 +2915,14 @@ class AppSolr
private function getCurrentTraceInfo() private function getCurrentTraceInfo()
{ {
$resultTraceString = ""; $resultTraceString = "";
//
$traceData = debug_backtrace(); $traceData = debug_backtrace();
foreach ($traceData as $key => $value) { foreach ($traceData as $key => $value) {
if($value['function'] != 'getCurrentTraceInfo' && $value['function'] != 'require_once') if ($value['function'] != 'getCurrentTraceInfo' && $value['function'] != 'require_once') {
if (isset($value['file']) && isset($value['line']) && isset($value['function'])) {
$resultTraceString .= $value['file'] . " (" . $value['line'] . ") " . $value['function'] . "\n"; $resultTraceString .= $value['file'] . " (" . $value['line'] . ") " . $value['function'] . "\n";
} }
}
}
return $resultTraceString; return $resultTraceString;
} }

View File

@@ -1152,8 +1152,10 @@ class Cases
//Logger deleteCase //Logger deleteCase
$nameFiles = ''; $nameFiles = '';
foreach (debug_backtrace() as $node) { foreach (debug_backtrace() as $node) {
if (isset($node['file']) && isset($node['function']) && isset($node['line'])) {
$nameFiles .= $node['file'] . ":" . $node['function'] . "(" . $node['line'] . ")\n"; $nameFiles .= $node['file'] . ":" . $node['function'] . "(" . $node['line'] . ")\n";
} }
}
$dataLog = \Bootstrap::getDefaultContextLog(); $dataLog = \Bootstrap::getDefaultContextLog();
$dataLog['usrUid'] = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : G::LoadTranslation('UID_UNDEFINED_USER'); $dataLog['usrUid'] = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : G::LoadTranslation('UID_UNDEFINED_USER');
$dataLog['appUid'] = $sAppUid; $dataLog['appUid'] = $sAppUid;