Merge branch 'refs/heads/1.1.1'

GonzoInc · GonzoInc · commit a0c0ca465ec7 · 2019-05-30T12:00:59.000-04:00
diff --git a/src/Logger/log.class.php b/src/Logger/log.class.php
@@ -73,7 +73,7 @@ protected function getBacktrace($ignore = 2)
                 $item = var_export($item, true);
             });
 
-            $trace .= '#' . ($k - $ignore) . ' ' . $v['file'] . '(' . $v['line'] . '): ' . (isset($v['class']) ? $v['class'] . '->' : '') . $v['function'] . '(' . implode(', ', $v['args']) . ')' . "\n";
+            $trace .= '#' . ($k - $ignore) . ' ' . $v['file'] . '(' . $v['line'] . '): ' . (isset($v['class']) ? $v['class'] . '->' : '') . $v['function'] . '(' . implode(', ', $v['args']) . ')';
         }
 
         return addslashes($trace);

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected function getBacktrace($ignore = 2)`
`73`	`73`	`$item = var_export($item, true);`
`74`	`74`	`});`
`75`	`75`
`76`		`- $trace .= '#' . ($k - $ignore) . ' ' . $v['file'] . '(' . $v['line'] . '): ' . (isset($v['class']) ? $v['class'] . '->' : '') . $v['function'] . '(' . implode(', ', $v['args']) . ')' . "\n";`
	`76`	`+ $trace .= '#' . ($k - $ignore) . ' ' . $v['file'] . '(' . $v['line'] . '): ' . (isset($v['class']) ? $v['class'] . '->' : '') . $v['function'] . '(' . implode(', ', $v['args']) . ')';`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return addslashes($trace);`