[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-17-g396e571

Michal Čihař nijel at users.sourceforge.net
Wed Dec 14 09:53:45 CET 2011


The branch, QA_3_4 has been updated
       via  396e5716f89d291f366266e639c26e2ed8391dd2 (commit)
       via  a074b4c6e28b044670d21dec791ad0f909eba251 (commit)
       via  ea64f8f731928cfed87f7149a39dc797af8ce08a (commit)
      from  629c5cbc3458ff6190bcada0080f1d065bb124ca (commit)


- Log -----------------------------------------------------------------
commit 396e5716f89d291f366266e639c26e2ed8391dd2
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Dec 14 09:51:18 2011 +0100

    Use mysqli in example configuration
    
    The mysql extension does not support some features we use and I think it
    is safe to assume nearly everybody has mysqli.

commit a074b4c6e28b044670d21dec791ad0f909eba251
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Dec 14 09:49:49 2011 +0100

    Create fake flags field
    
    The content is empty for now, but at least the code will not emit
    warnings on every access to it (which is quite often). The proper value
    calculation should be added later.

commit ea64f8f731928cfed87f7149a39dc797af8ce08a
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Dec 14 09:49:35 2011 +0100

    Whitespace cleanup

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

Summary of changes:
 config.sample.inc.php           |    4 ++--
 libraries/dbi/mysql.dbi.lib.php |   10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/config.sample.inc.php b/config.sample.inc.php
index 0ea16d5..1a22fc3 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -31,8 +31,8 @@ $cfg['Servers'][$i]['auth_type'] = 'cookie';
 $cfg['Servers'][$i]['host'] = 'localhost';
 $cfg['Servers'][$i]['connect_type'] = 'tcp';
 $cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
+/* Select mysql if your server does not have mysqli */
+$cfg['Servers'][$i]['extension'] = 'mysqli';
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 
 /*
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index c4f22fb..96b6933 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -175,8 +175,8 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r
         $r = mysql_query($query, $link);
     }
 
-    if ($cache_affected_rows) { 
-       $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); 
+    if ($cache_affected_rows) {
+       $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false);
     }
 
     if ($GLOBALS['cfg']['DBG']['sql']) {
@@ -406,7 +406,7 @@ function PMA_DBI_insert_id($link = null)
  * @uses    $GLOBALS['userlink']
  * @uses    mysql_affected_rows()
  * @param   object mysql   $link   the mysql object
- * @param   boolean        $get_from_cache 
+ * @param   boolean        $get_from_cache
  * @return  string integer
  */
 function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
@@ -434,7 +434,9 @@ function PMA_DBI_get_fields_meta($result)
     $fields       = array();
     $num_fields   = mysql_num_fields($result);
     for ($i = 0; $i < $num_fields; $i++) {
-        $fields[] = mysql_fetch_field($result, $i);
+        $field = mysql_fetch_field($result, $i);
+        $field->flags = '';
+        $fields[] = $field;
     }
     return $fields;
 }


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list