[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17004-gf42b1d1

[Piotr Przybylski]

The branch, master has been updated
       via  f42b1d14dca8d982ed2305f28a2b6818fea8cadd (commit)
      from  1fddc1891bdef030fc10eb66eaf78eb2a2d42335 (commit)


- Log -----------------------------------------------------------------
commit f42b1d14dca8d982ed2305f28a2b6818fea8cadd
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Wed Aug 24 12:12:04 2011 +0200

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

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

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

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 074715d..1b10c04 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1004,14 +1004,13 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null)
  *                                      returned array should either numeric
  *                                      associativ or booth
  * @param resource            $link   mysql link
- * @param mixed               $options
  * @return  array|boolean       first row from result
  *                              or false if result is empty
  */
-function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $options = 0)
+function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null)
 {
     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 null if result is empty or false


hooks/post-receive
-- 
phpMyAdmin