From e94c2b90dee7d87b0c6b85ce7ca9dfbda24fb52f Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 19 Feb 2010 14:33:49 +0000 Subject: [PATCH] Fix multi_query git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1323 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/pdo.inc.php | 28 +++++++++++++--------------- tests/0-login.html | 6 +++--- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php index 5836a23c..a8d949ec 100644 --- a/adminer/include/pdo.inc.php +++ b/adminer/include/pdo.inc.php @@ -20,32 +20,30 @@ if (extension_loaded('pdo')) { } function query($query, $unbuffered = false) { - $return = parent::query($query); - if (!$return) { + $result = parent::query($query); + if (!$result) { $errorInfo = $this->errorInfo(); $this->error = $errorInfo[2]; return false; } - if ($return->columnCount()) { - $this->affected_rows = $return->rowCount(); - } else { - $return->num_rows = $return->rowCount(); // is not guaranteed to work with all drivers - } - return $return; + $this->store_result($result); + return $result; } function multi_query($query) { return $this->_result = $this->query($query); } - function store_result() { - $return = &$this->_result; - if ($return->columnCount()) { - $this->affected_rows = $return->rowCount(); - return true; + function store_result($result = null) { + if (!$result) { + $result = $this->_result; } - $return->num_rows = $return->rowCount(); - return $return; + if ($result->columnCount()) { + $result->num_rows = $result->rowCount(); // is not guaranteed to work with all drivers + return $result; + } + $this->affected_rows = $result->rowCount(); + return true; } function next_result() { diff --git a/tests/0-login.html b/tests/0-login.html index 8cd77a45..f238acca 100644 --- a/tests/0-login.html +++ b/tests/0-login.html @@ -4,12 +4,12 @@ -Create database +Login - + @@ -18,7 +18,7 @@ - +
Create database
Login
open
open/adminer/adminer/?lang=en&username=/adminer/adminer/?lang=en&username=ODBC