From 8e0fe3dc3df1b7328e16edb63bfde581c6afd1c6 Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Mon, 15 Oct 2012 22:36:03 -0400 Subject: [PATCH] Added sanity check to class index of backtrace return Seems there's a scenario within PICKLES that provides a backtrace report that lacks a class name (even though the file being referenced is a class). If no class is set it's simply omitted. --- classes/Database/PDO/Common.php | 5 ++++- jar.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Database/PDO/Common.php b/classes/Database/PDO/Common.php index 6e0353d..5df3936 100644 --- a/classes/Database/PDO/Common.php +++ b/classes/Database/PDO/Common.php @@ -157,7 +157,10 @@ class Database_PDO_Common extends Database_Common foreach ($backtrace as $file) { - $files[] = $file['class'] . ':' . $file['line']; + if (isset($file['class'])) + { + $files[] = $file['class'] . ':' . $file['line']; + } } $sql .= "\n" . '/* [' . implode('|', $files) . '] */'; diff --git a/jar.php b/jar.php index 09cb243..ce6adaf 100755 --- a/jar.php +++ b/jar.php @@ -1970,7 +1970,10 @@ class Database_PDO_Common extends Database_Common foreach ($backtrace as $file) { - $files[] = $file['class'] . ':' . $file['line']; + if (isset($file['class'])) + { + $files[] = $file['class'] . ':' . $file['line']; + } } $sql .= "\n" . '/* [' . implode('|', $files) . '] */';