[geeklog-hg] geeklog: tweaked call stack creation in case of an SQL error

[geeklog-cvs at lists.geeklog.net]

changeset 9000:cde155736a2d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cde155736a2d
user: Dirk Haun <dirk at haun-online.de>
date: Sun Mar 17 13:33:24 2013 +0100
description:
tweaked call stack creation in case of an SQL error

diffstat:

 system/databases/mssql.class.php  |  12 ++++++++----
 system/databases/mysql.class.php  |  12 ++++++++----
 system/databases/mysqli.class.php |  12 ++++++++----
 system/databases/pgsql.class.php  |  12 ++++++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

diffs (92 lines):

diff -r b076a681e534 -r cde155736a2d system/databases/mssql.class.php
--- a/system/databases/mssql.class.php	Sat Mar 16 20:08:52 2013 +0100
+++ b/system/databases/mssql.class.php	Sun Mar 17 13:33:24 2013 +0100
@@ -992,11 +992,15 @@
             $btr = debug_backtrace();
             if (! empty($btr)) {
                 for ($i = 0; $i < 100; $i++) {
-                    $b = $btr[$i];
-                    if ($b['function'] == 'DB_query') {
-                        if (!empty($b['file']) && !empty($b['line'])) {
-                            $fn = $b['file'] . ':' . $b['line'];
+                    if (isset($btr[$i])) {
+                        $b = $btr[$i];
+                        if ($b['function'] == 'DB_query') {
+                            if (!empty($b['file']) && !empty($b['line'])) {
+                                $fn = $b['file'] . ':' . $b['line'];
+                            }
+                            break;
                         }
+                    } else {
                         break;
                     }
                 }
diff -r b076a681e534 -r cde155736a2d system/databases/mysql.class.php
--- a/system/databases/mysql.class.php	Sat Mar 16 20:08:52 2013 +0100
+++ b/system/databases/mysql.class.php	Sun Mar 17 13:33:24 2013 +0100
@@ -748,11 +748,15 @@
             $btr = debug_backtrace();
             if (! empty($btr)) {
                 for ($i = 0; $i < 100; $i++) {
-                    $b = $btr[$i];
-                    if ($b['function'] == 'DB_query') {
-                        if (!empty($b['file']) && !empty($b['line'])) {
-                            $fn = $b['file'] . ':' . $b['line'];
+                    if (isset($btr[$i])) {
+                        $b = $btr[$i];
+                        if ($b['function'] == 'DB_query') {
+                            if (!empty($b['file']) && !empty($b['line'])) {
+                                $fn = $b['file'] . ':' . $b['line'];
+                            }
+                            break;
                         }
+                    } else {
                         break;
                     }
                 }
diff -r b076a681e534 -r cde155736a2d system/databases/mysqli.class.php
--- a/system/databases/mysqli.class.php	Sat Mar 16 20:08:52 2013 +0100
+++ b/system/databases/mysqli.class.php	Sun Mar 17 13:33:24 2013 +0100
@@ -683,11 +683,15 @@
             $btr = debug_backtrace();
             if (! empty($btr)) {
                 for ($i = 0; $i < 100; $i++) {
-                    $b = $btr[$i];
-                    if ($b['function'] == 'DB_query') {
-                        if (!empty($b['file']) && !empty($b['line'])) {
-                            $fn = $b['file'] . ':' . $b['line'];
+                    if (isset($btr[$i])) {
+                        $b = $btr[$i];
+                        if ($b['function'] == 'DB_query') {
+                            if (!empty($b['file']) && !empty($b['line'])) {
+                                $fn = $b['file'] . ':' . $b['line'];
+                            }
+                            break;
                         }
+                    } else {
                         break;
                     }
                 }
diff -r b076a681e534 -r cde155736a2d system/databases/pgsql.class.php
--- a/system/databases/pgsql.class.php	Sat Mar 16 20:08:52 2013 +0100
+++ b/system/databases/pgsql.class.php	Sun Mar 17 13:33:24 2013 +0100
@@ -837,11 +837,15 @@
         $btr = debug_backtrace();
         if (! empty($btr)) {
             for ($i = 0; $i < count($btr); $i++) {
-                $b = $btr[$i];
-                if ($b['function'] == 'DB_query') {
-                    if (!empty($b['file']) && !empty($b['line'])) {
-                        $fn = $b['file'] . ':' . $b['line'];
+                if (isset($btr[$i])) {
+                    $b = $btr[$i];
+                    if ($b['function'] == 'DB_query') {
+                        if (!empty($b['file']) && !empty($b['line'])) {
+                            $fn = $b['file'] . ':' . $b['line'];
+                        }
+                        break;
                     }
+                } else {
                     break;
                 }
             }