Some more missing renamings

phpmyadmin · May 26, 2013 · 5c9941a · 5c9941a
1 parent 8b8d1f8
commit 5c9941a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/schema_export.php b/schema_export.php
@@ -52,7 +52,7 @@
 if (! isset($export_type) || ! preg_match('/^[a-zA-Z]+$/', $export_type)) {
     $export_type = 'pdf';
 }
-PMA_DBI_selectDb($db);
+$GLOBALS['dbi']->selectDb($db);
 
 $path = PMA_securePath(ucfirst($export_type));
 if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) {

diff --git a/server_plugins.php b/server_plugins.php
@@ -40,15 +40,15 @@
     FROM data_dictionary.plugins p
         JOIN data_dictionary.modules m USING (module_name)
     ORDER BY m.module_name, p.plugin_type, p.plugin_name";
-$res = PMA_DBI_query($sql);
+$res = $GLOBALS['dbi']->query($sql);
 $plugins = array();
 $modules = array();
-while ($row = PMA_DBI_fetchAssoc($res)) {
+while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
     $plugins[$row['plugin_type']][] = $row;
     $modules[$row['module_name']]['info'] = $row;
     $modules[$row['module_name']]['plugins'][$row['plugin_type']][] = $row;
 }
-PMA_DBI_freeResult($res);
+$GLOBALS['dbi']->freeResult($res);
 
 // sort plugin list (modules are already sorted)
 ksort($plugins);

diff --git a/server_status_variables.php b/server_status_variables.php
@@ -28,7 +28,7 @@
     );
 
     if (in_array($_REQUEST['flush'], $_flush_commands)) {
-        PMA_DBI_query('FLUSH ' . $_REQUEST['flush'] . ';');
+        $GLOBALS['dbi']->query('FLUSH ' . $_REQUEST['flush'] . ';');
     }
     unset($_flush_commands);
 }

diff --git a/tbl_chart.php b/tbl_chart.php
@@ -28,8 +28,8 @@
     $sql_with_limit = 'SELECT * FROM( ' . $sql_query . ' ) AS `temp_res` LIMIT '
         . $_REQUEST['pos'] . ', ' . $_REQUEST['session_max_rows'];
     $data = array();
-    $result = PMA_DBI_tryQuery($sql_with_limit);
-    while ($row = PMA_DBI_fetchAssoc($result)) {
+    $result = $GLOBALS['dbi']->tryQuery($sql_with_limit);
+    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
         $data[] = $row;
     }
 
@@ -102,9 +102,9 @@
 
 $data = array();
 
-$result = PMA_DBI_tryQuery($sql_query);
-$fields_meta = PMA_DBI_getFieldsMeta($result);
-while ($row = PMA_DBI_fetchAssoc($result)) {
+$result = $GLOBALS['dbi']->tryQuery($sql_query);
+$fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
+while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
     $data[] = $row;
 }
 

diff --git a/tbl_get_field.php b/tbl_get_field.php
@@ -32,23 +32,23 @@
 );
 
 /* Select database */
-if (!PMA_DBI_selectDb($db)) {
+if (!$GLOBALS['dbi']->selectDb($db)) {
     PMA_Util::mysqlDie(
         sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)),
         '', ''
     );
 }
 
 /* Check if table exists */
-if (!PMA_DBI_getColumns($db, $table)) {
+if (!$GLOBALS['dbi']->getColumns($db, $table)) {
     PMA_Util::mysqlDie(__('Invalid table name'));
 }
 
 /* Grab data */
 $sql = 'SELECT ' . PMA_Util::backquote($transform_key)
     . ' FROM ' . PMA_Util::backquote($table)
     . ' WHERE ' . $where_clause . ';';
-$result = PMA_DBI_fetchValue($sql);
+$result = $GLOBALS['dbi']->fetchValue($sql);
 
 /* Check return code */
 if ($result === false) {

diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
@@ -27,9 +27,9 @@
 }
 
 // Execute the query and return the result
-$result = PMA_DBI_tryQuery($sql_query);
+$result = $GLOBALS['dbi']->tryQuery($sql_query);
 // Get the meta data of results
-$meta = PMA_DBI_getFieldsMeta($result);
+$meta = $GLOBALS['dbi']->getFieldsMeta($result);
 
 // Find the candidate fields for label column and spatial column
 $labelCandidates = array(); $spatialCandidates = array();
@@ -58,10 +58,10 @@
 
 // Convert geometric columns from bytes to text.
 $modified_query = PMA_GIS_modifyQuery($sql_query, $visualizationSettings);
-$modified_result = PMA_DBI_tryQuery($modified_query);
+$modified_result = $GLOBALS['dbi']->tryQuery($modified_query);
 
 $data = array();
-while ($row = PMA_DBI_fetchAssoc($modified_result)) {
+while ($row = $GLOBALS['dbi']->fetchAssoc($modified_result)) {
     $data[] = $row;
 }
 

diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
@@ -61,9 +61,9 @@
     $extra_data = array();
     $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`'
         . $_REQUEST['table'] . '` WHERE ' .  $_REQUEST['where_clause'];
-    $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE);
-    $fields_meta = PMA_DBI_getFieldsMeta($result);
-    while ($row = PMA_DBI_fetchAssoc($result)) {
+    $result = $GLOBALS['dbi']->query($row_info_query . ";", null, PMA_DBI_QUERY_STORE);
+    $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
+    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
         // for bit fields we need to convert them to printable form
         $i = 0;
         foreach ($row as $col => $val) {
@@ -138,9 +138,9 @@
     $sql_query .= ' LIMIT ' . $maxPlotLimit;
 
     //Query execution part
-    $result = PMA_DBI_query($sql_query . ";", null, PMA_DBI_QUERY_STORE);
-    $fields_meta = PMA_DBI_getFieldsMeta($result);
-    while ($row = PMA_DBI_fetchAssoc($result)) {
+    $result = $GLOBALS['dbi']->query($sql_query . ";", null, PMA_DBI_QUERY_STORE);
+    $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
+    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
         //Need a row with indexes as 0,1,2 for the getUniqueCondition
         // hence using a temporary array
         $tmpRow = array();