[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16993-ge7994a3

[Piotr Przybylski]

The branch, master has been updated
       via  e7994a364e811c0fcbbd58fbbd2fa6a088bd0a3c (commit)
      from  da6c5b71294892dda8da09ce8886ce35abf48a78 (commit)


- Log -----------------------------------------------------------------
commit e7994a364e811c0fcbbd58fbbd2fa6a088bd0a3c
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Tue Aug 23 22:56:35 2011 +0200

    PMA_DBI_fetch_value() doesn't shouldn't allow to set the $options argument

-----------------------------------------------------------------------

Summary of changes:
 libraries/database_interface.lib.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 3db1b49..074715d 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -899,7 +899,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
             define('PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true));
         } else {
             $mysql_version = PMA_DBI_fetch_value(
-                'SELECT VERSION()', 0, 0, $link, PMA_DBI_QUERY_STORE);
+                'SELECT VERSION()', 0, 0, $link);
             if ($mysql_version) {
                 $match = explode('.', $mysql_version);
                 define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
@@ -950,16 +950,15 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
  * @param integer|string      $field  field to fetch the value from,
  *                                      starting at 0, with 0 beeing default
  * @param resource            $link   mysql link
- * @param mixed               $options
  * @return  mixed               value of first field in first row from result
  *                              or false if not found
  */
-function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, $options = 0)
+function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null)
 {
     $value = false;
 
     if (is_string($result)) {
-        $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE, false);
+        $result = PMA_DBI_try_query($result, $link, PMA_DBI_QUERY_STORE, false);
     }
 
     // return false if result is empty or false


hooks/post-receive
-- 
phpMyAdmin