diff options
| author | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-05-04 06:56:27 +0400 |
|---|---|---|
| committer | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-05-04 06:56:27 +0400 |
| commit | 42256b2d0cdc1d405f34a20d2fcb4224f4545a40 (patch) | |
| tree | fabcdd9b2e6339271d6b44a2a71c7ac7975698c5 | |
| parent | 85e16d8bdc641a0d99d5c0fb6894f6130ac52e63 (diff) | |
PMA_DBI_select_db --> PMA_DBI_selectDb
39 files changed, 61 insertions, 61 deletions
diff --git a/db_datadict.php b/db_datadict.php index 9c6b0f3c0b..9b3c0ca8f3 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -56,7 +56,7 @@ if ($cfgRelation['commwork']) { /** * Selects the database and gets tables names */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $tables = PMA_DBI_getTables($db); $count = 0; @@ -76,7 +76,7 @@ foreach ($tables as $table) { * Gets table keys and retains them */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $indexes = PMA_DBI_getTableIndexes($db, $table); $primary = ''; $indexes = array(); diff --git a/db_operations.php b/db_operations.php index b31e456bef..4f4d1b14a6 100644 --- a/db_operations.php +++ b/db_operations.php @@ -62,7 +62,7 @@ if (strlen($db) PMA_runProcedureAndFunctionDefinitions($db); // go back to current db, just in case - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tables_full = PMA_DBI_getTablesFull($db); @@ -109,7 +109,7 @@ if (strlen($db) } // go back to current db, just in case - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Duplicate the bookmarks for this db (done once for each db) PMA_duplicateBookmarks($_error, $db); diff --git a/export.php b/export.php index 302b86752e..cfe18c594a 100644 --- a/export.php +++ b/export.php @@ -832,7 +832,7 @@ do { $sql_query = preg_replace('%;\s*$%', '', $sql_query); } $local_query = $sql_query . $add_query; - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } else { $local_query = 'SELECT * FROM ' . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table) . $add_query; diff --git a/import.php b/import.php index 00ed893c0b..a81d716812 100644 --- a/import.php +++ b/import.php @@ -181,7 +181,7 @@ if ($import_type == 'table') { if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } @set_time_limit($cfg['ExecTimeLimit']); diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index 216e9d29e7..b6e62e7fd2 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -1065,7 +1065,7 @@ class PMA_DbQbe private function _getLeftJoinColumnCandidates($all_tables, $all_columns, $where_clause_columns ) { - PMA_DBI_select_db($this->_db); + PMA_DBI_selectDb($this->_db); $candidate_columns = array(); // Get unique columns and index columns diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 31a9a82e7d..acf00890d6 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -748,7 +748,7 @@ class PMA_Table // Doing a select_db could avoid some problems with replicated databases, // when moving table from replicated one to not replicated one - PMA_DBI_select_db($target_db); + PMA_DBI_selectDb($target_db); $target = PMA_Util::backquote($target_db) . '.' . PMA_Util::backquote($target_table); @@ -936,7 +936,7 @@ class PMA_Table // This could avoid some problems with replicated databases, when // moving table from replicated one to not replicated one - PMA_DBI_select_db($source_db); + PMA_DBI_selectDb($source_db); if (PMA_Table::isView($source_db, $source_table)) { $sql_drop_query = 'DROP VIEW'; @@ -1201,7 +1201,7 @@ class PMA_Table if (! PMA_DBI_query($GLOBALS['sql_query'])) { // Restore triggers in the old database if ($handle_triggers) { - PMA_DBI_select_db($this->getDbName()); + PMA_DBI_selectDb($this->getDbName()); foreach ($triggers as $trigger) { PMA_DBI_query($trigger['create']); } diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 6cd4fc4688..2551f22ae2 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -36,7 +36,7 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); */ if (! isset($is_db) || ! $is_db) { if (strlen($db)) { - $is_db = PMA_DBI_select_db($db); + $is_db = PMA_DBI_selectDb($db); // This "Command out of sync" 2014 error may happen, for example // after calling a MySQL procedure; at this point we can't select // the db but it's not necessarily wrong diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 40ed7fe1be..8a7b50453f 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { if (empty($is_db)) { if (strlen($db)) { - $is_db = @PMA_DBI_select_db($db); + $is_db = @PMA_DBI_selectDb($db); } else { $is_db = false; } diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 51614de88e..7500f47318 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -165,7 +165,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index d8827cfb2f..91942370af 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -302,7 +302,7 @@ function PMA_DBI_connect( * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { $GLOBALS['dummy_db'] = $dbname; return true; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b5b1ca2fa1..99b0a296e6 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -188,7 +188,7 @@ function PMA_DBI_connect( * * @return bool */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 957cf42489..432133a6ed 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -233,7 +233,7 @@ function PMA_DBI_connect( * * @return boolean */ -function PMA_DBI_select_db($dbname, $link = null) +function PMA_DBI_selectDb($dbname, $link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 1c1ddbf7e1..c1aa449df2 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -86,7 +86,7 @@ if (! empty($submit_mult) break; case 'primary': // Gets table primary key - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_Util::backquote($table) . ';'); $primary = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -365,7 +365,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($query_type == 'primary_fld') { // Gets table primary key - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_Util::backquote($table) . ';'); $primary = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -523,7 +523,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($run_parts) { $sql_query .= $a_query . ';' . "\n"; if ($query_type != 'drop_db') { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } $result = PMA_DBI_query($a_query); @@ -551,7 +551,7 @@ if (!empty($submit_mult) && !empty($what)) { if ($use_sql) { include './sql.php'; } elseif (!$run_parts) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // for disabling foreign key checks while dropping tables if (! isset($_REQUEST['fk_check']) && $query_type == 'drop_tbl') { PMA_DBI_query('SET FOREIGN_KEY_CHECKS = 0;'); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 09ecf83685..cef00cf630 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -203,12 +203,12 @@ function PMA_getDbCollation($db) . '\' LIMIT 1'; return PMA_DBI_fetchValue($sql); } else { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $return = PMA_DBI_fetchValue( 'SHOW VARIABLES LIKE \'collation_database\'', 0, 1 ); if ($db !== $GLOBALS['db']) { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); } return $return; } diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index a5265ce82a..13bb4e4dbd 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -297,13 +297,13 @@ function PMA_runProcedureAndFunctionDefinitions($db) $procedure_names = PMA_DBI_getProceduresOrFunctions($db, 'PROCEDURE'); if ($procedure_names) { foreach ($procedure_names as $procedure_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition( $db, 'PROCEDURE', $procedure_name ); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -311,11 +311,11 @@ function PMA_runProcedureAndFunctionDefinitions($db) $function_names = PMA_DBI_getProceduresOrFunctions($db, 'FUNCTION'); if ($function_names) { foreach ($function_names as $function_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition($db, 'FUNCTION', $function_name); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -415,7 +415,7 @@ function PMA_getViewsAndCreateSqlViewStandIn( $sql_view_standin = $export_sql_plugin->getTableDefStandIn( $db, $each_table, "\n" ); - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($sql_view_standin); $GLOBALS['sql_query'] .= "\n" . $sql_view_standin; } @@ -476,7 +476,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db) } // apply the triggers to the destination db+table if ($triggers) { - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); foreach ($triggers as $trigger) { PMA_DBI_query($trigger['create']); $GLOBALS['sql_query'] .= "\n" . $trigger['create'] . ';'; @@ -517,11 +517,11 @@ function PMA_runEventDefinitionsForDb($db) ); if ($event_names) { foreach ($event_names as $event_name) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); $tmp_query = PMA_DBI_getDefinition($db, 'EVENT', $event_name); // collect for later display $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); PMA_DBI_query($tmp_query); } } @@ -571,7 +571,7 @@ function PMA_handleTheViews($views, $move, $db) */ function PMA_createAllAccumulatedConstraints() { - PMA_DBI_select_db($_REQUEST['newname']); + PMA_DBI_selectDb($_REQUEST['newname']); foreach ($GLOBALS['sql_constraints_query_full_db'] as $one_query) { PMA_DBI_query($one_query); // and prepare to display them diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index 0f925f9029..4587b82f1c 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -353,7 +353,7 @@ class ExportHtmlword extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 17150f0a80..5ef5c19b33 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -462,7 +462,7 @@ class ExportLatex extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 299326bddf..657eed89e8 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -340,7 +340,7 @@ class ExportOdt extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /** * Displays the table structure @@ -416,7 +416,7 @@ class ExportOdt extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index 7b1d816cbd..180f9febe7 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -259,7 +259,7 @@ class ExportTexytext extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /** * Displays the table structure @@ -333,7 +333,7 @@ class ExportTexytext extends ExportPlugin /** * Gets fields properties */ - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index f491e3fa9e..75958affb8 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -29,7 +29,7 @@ function get_tables_info() $tables = PMA_DBI_getTablesFull($GLOBALS['db']); // seems to be needed later - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $i = 0; foreach ($tables as $one_table) { $GLOBALS['PMD']['TABLE_NAME'][$i] @@ -73,7 +73,7 @@ function get_tables_info() */ function get_columns_info() { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $tab_column = array(); for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) { $fields_rs = PMA_DBI_query( @@ -106,7 +106,7 @@ function get_columns_info() */ function get_script_contr() { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $con["C_NAME"] = array(); $i = 0; $alltab_rs = PMA_DBI_query( diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index aa37c2079c..d5872b9949 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -365,7 +365,7 @@ function PMA__getRelationsParam() if ($GLOBALS['server'] == 0 || empty($GLOBALS['cfg']['Server']['pmadb']) - || ! PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) + || ! PMA_DBI_selectDb($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) ) { // No server selected -> no bookmark table // we return the array with the falses in it, diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index ae3e63ea4f..6e394f1b61 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -36,7 +36,7 @@ if ($GLOBALS['is_ajax_request'] != true) { * create the missing $url_query variable */ if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); if (! isset($url_query)) { $url_query = PMA_generate_common_url($db, $table); } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 9a3ecf64a8..bb78daafbb 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -638,7 +638,7 @@ class PMA_User_Schema $export_type = 'pdf'; } - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php"; diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 4e7c47f356..55e584afb8 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -36,7 +36,7 @@ $is_superuser = PMA_isSuperuser(); // now, select the mysql db if ($is_superuser && ! PMA_DRIZZLE) { - PMA_DBI_select_db('mysql', $userlink); + PMA_DBI_selectDb('mysql', $userlink); } /** diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 3252888e5b..0574471a21 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2338,7 +2338,7 @@ function PMA_updateColumns($db, $table) // To allow replication, we first select the db to use and then run queries // on this db. - if (! PMA_DBI_select_db($db)) { + if (! PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( PMA_DBI_getError(), 'USE ' . PMA_Util::backquote($db) . ';', @@ -2419,7 +2419,7 @@ function PMA_updateColumns($db, $table) */ function PMA_moveColumns($db, $table) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); /* * load the definitions for all columns diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 7347a8497b..10a9ed5e65 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -26,7 +26,7 @@ global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collat */ // Seems we need to do this in MySQL 5.0.2, // otherwise error #1046, no database selected -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** diff --git a/schema_export.php b/schema_export.php index 90f684a2fd..1efc839025 100644 --- a/schema_export.php +++ b/schema_export.php @@ -52,7 +52,7 @@ foreach ($post_params as $one_post_param) { if (! isset($export_type) || ! preg_match('/^[a-zA-Z]+$/', $export_type)) { $export_type = 'pdf'; } -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) { diff --git a/server_status_monitor.php b/server_status_monitor.php index 72e7a8c8ae..b55eea9292 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -349,7 +349,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return = array(); if (strlen($_REQUEST['database'])) { - PMA_DBI_select_db($_REQUEST['database']); + PMA_DBI_selectDb($_REQUEST['database']); } if ($profiling = PMA_Util::profilingSupported()) { @@ -616,7 +616,7 @@ if (($_SESSION['tmp_user_values']['max_rows'] != 'all') } if (strlen($db)) { - PMA_DBI_select_db($db); + PMA_DBI_selectDb($db); } // E x e c u t e t h e q u e r y diff --git a/tbl_addfield.php b/tbl_addfield.php index a456badde9..259581025b 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -170,7 +170,7 @@ if (isset($_REQUEST['do_save_data'])) { // To allow replication, we first select the db to use and then run queries // on this db. - PMA_DBI_select_db($db) + PMA_DBI_selectDb($db) or PMA_Util::mysqlDie( PMA_DBI_getError(), 'USE ' . PMA_Util::backquote($db), '', $err_url ); diff --git a/tbl_change.php b/tbl_change.php index 1085afdfa9..2be72260ce 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -143,7 +143,7 @@ unset($show_create_table); /** * Get the list of the fields of the current table */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $table_fields = array_values(PMA_DBI_getColumns($db, $table)); $paramTableDbArray = array($table, $db); diff --git a/tbl_create.php b/tbl_create.php index 71061cb5ad..618fd3d9c3 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -53,7 +53,7 @@ if (isset($_REQUEST['submit_num_fields'])) { /** * Selects the database to work with */ -if (!PMA_DBI_select_db($db)) { +if (!PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)), '', diff --git a/tbl_get_field.php b/tbl_get_field.php index 98085a2b45..84f8681913 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -32,7 +32,7 @@ PMA_Util::checkParameters( ); /* Select database */ -if (!PMA_DBI_select_db($db)) { +if (!PMA_DBI_selectDb($db)) { PMA_Util::mysqlDie( sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)), '', '' diff --git a/tbl_move_copy.php b/tbl_move_copy.php index b21f295585..3c73ecfe27 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -22,7 +22,7 @@ $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); /** * Selects the database to work with */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); $goto = $cfg['DefaultTabTable']; diff --git a/tbl_operations.php b/tbl_operations.php index 22f054db31..c284c7ef98 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -43,7 +43,7 @@ require_once 'libraries/Partition.class.php'; // reselect current db (needed in some cases probably due to // the calling of relation.lib.php) -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** * Gets tables informations @@ -364,7 +364,7 @@ unset($partition_names); // this choice (InnoDB maintains integrity by itself) if ($cfgRelation['relwork'] && ! $is_innodb) { - PMA_DBI_select_db($GLOBALS['db']); + PMA_DBI_selectDb($GLOBALS['db']); $foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table']); if ($foreign) { diff --git a/tbl_printview.php b/tbl_printview.php index 8e67797522..018737eaf2 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -43,7 +43,7 @@ if (strlen($table)) { /** * Selects the database */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); /** diff --git a/tbl_replace.php b/tbl_replace.php index 55e53d9993..e3b5c6c746 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -25,7 +25,7 @@ require_once 'libraries/insert_edit.lib.php'; // Check parameters PMA_Util::checkParameters(array('db', 'table', 'goto')); -PMA_DBI_select_db($GLOBALS['db']); +PMA_DBI_selectDb($GLOBALS['db']); /** * Initializes some variables diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 436be5a187..2658b9b8f6 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -46,7 +46,7 @@ foreach ($request_params as $one_request_param) { /** * Get the list of the fields of the current table */ -PMA_DBI_select_db($db); +PMA_DBI_selectDb($db); if (isset($where_clause)) { $result = PMA_DBI_query( 'SELECT * FROM ' . PMA_Util::backquote($table) . ' WHERE ' . $where_clause . ';', diff --git a/user_password.php b/user_password.php index 1e2d174cf6..ca105612de 100644 --- a/user_password.php +++ b/user_password.php @@ -22,7 +22,7 @@ $scripts->addFile('server_privileges.js'); * script */ if (! $cfg['ShowChgPassword']) { - $cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql'); + $cfg['ShowChgPassword'] = PMA_DBI_selectDb('mysql'); } if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) { PMA_Message::error( |