[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17215-gd3c7b0e

[Michal Čihař]

The branch, master has been updated
       via  d3c7b0ea4dfa69b97a7c0cc8bd2c9f2adcf3a86a (commit)
      from  6e05e71d1f2585c0cae63b245e189346908c3a10 (commit)


- Log -----------------------------------------------------------------
commit d3c7b0ea4dfa69b97a7c0cc8bd2c9f2adcf3a86a
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Aug 25 08:56:59 2011 +0200

    Adjust to new calling conventions

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

Summary of changes:
 libraries/pmd_common.php         |    4 ++--
 libraries/sql_query_form.lib.php |    2 +-
 libraries/tbl_select.lib.php     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index e671690..7d14191 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -75,7 +75,7 @@ function get_tab_info()
     PMA_DBI_select_db($GLOBALS['db']);
     $tab_column = array();
     for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) {
-        $fields_rs   = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], true), NULL, PMA_DBI_QUERY_STORE);
+        $fields_rs   = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), NULL, PMA_DBI_QUERY_STORE);
         $j = 0;
         while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
             $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j]   = $j;
@@ -175,7 +175,7 @@ function get_all_keys($unique_only = false)
     require_once './libraries/Index.class.php';
 
     $keys = array();
-        
+
     foreach ($GLOBALS['PMD']['TABLE_NAME_SMALL'] as $I => $table) {
         $schema = $GLOBALS['PMD']['OWNER'][$I];
         // for now, take into account only the first index segment
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index beab95d..78502c1 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -213,7 +213,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         // Get the list and number of fields
         // we do a try_query here, because we could be in the query window,
         // trying to synchonize and the table has not yet been created
-        $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], true);
+        $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], null, true);
 
         $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
             . '?' . PMA_generate_common_url($db) . '"';
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 446a26e..b200e45 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -46,7 +46,7 @@ function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage)
 function PMA_tbl_getFields($db, $table)
 {
     // Gets the list and number of fields
-    $fields = PMA_DBI_get_columns($db, $table, true);
+    $fields = PMA_DBI_get_columns($db, $table, null, true);
     $fields_list = $fields_null = $fields_type = $fields_collation = array();
     $geom_column_present = false;
     $geom_types = PMA_getGISDatatypes();


hooks/post-receive
-- 
phpMyAdmin