]> git.joonet.de Git - adminer.git/commitdiff
Check $dbh2
authorjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Sat, 12 Sep 2009 12:57:02 +0000 (12:57 +0000)
committerjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Sat, 12 Sep 2009 12:57:02 +0000 (12:57 +0000)
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1102 7c3ca157-0c34-0410-bff1-cbf682f78f5c

adminer/sql.inc.php

index 720df72748b9ecd9ef70c2af2455d96980b72fdd..1e97a073c5cb04ed7e3dcf71367faa0ee42540d1 100644 (file)
@@ -72,11 +72,12 @@ if (!$error && $_POST) {
                                                                $result = $dbh->store_result();
                                                                if (is_object($result)) {
                                                                        select($result, $dbh2);
-                                                                       if (preg_match("~^$space*SELECT$space+~isU", $q)) {
+                                                                       echo "<p>" . lang('%d row(s)', $result->num_rows);
+                                                                       if ($dbh2 && preg_match("~^$space*SELECT$space+~isU", $q)) {
                                                                                $id = "explain-$explain";
-                                                                               echo "<p>" . lang('%d row(s)', $result->num_rows) . ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
+                                                                               echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
                                                                                echo "<div id='$id' class='hidden'>\n";
-                                                                               select($dbh2->query("EXPLAIN $q"));
+                                                                               select($dbh2->query("EXPLAIN $q"), $dbh2);
                                                                                echo "</div>\n";
                                                                                $explain++;
                                                                        }