nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix format strings.

Browse Source
This commit is contained in:
Michal Čihař
2010-05-05 11:43:09 +02:00
parent 5bcca1a6b5
commit 5c2a111011
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/Table.class.php
View File

@@ -245,7 +245,7 @@ class PMA_Table
* *
* @param string the database name * @param string the database name
* @param string the table name * @param string the table name
* @return boolean true if it is a merge table * @return boolean true if it is a merge table
* @access public * @access public
*/ */
static public function isMerge($db = null, $table = null) static public function isMerge($db = null, $table = null)
@@ -480,7 +480,7 @@ class PMA_Table
} else { } else {
// Counting all rows of a VIEW could be too long, so use // Counting all rows of a VIEW could be too long, so use
// a LIMIT clause. // a LIMIT clause.
// Use try_query because it can fail (when a VIEW is // Use try_query because it can fail (when a VIEW is
// based on a table that no longer exists) // based on a table that no longer exists)
$result = PMA_DBI_try_query( $result = PMA_DBI_try_query(
'SELECT 1 FROM ' . PMA_backquote($db) . '.' 'SELECT 1 FROM ' . PMA_backquote($db) . '.'
@@ -667,7 +667,7 @@ class PMA_Table
} }
unset($analyzed_sql); unset($analyzed_sql);
$server_sql_mode = PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'sql_mode'", 0, 1); $server_sql_mode = PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'sql_mode'", 0, 1);
// ANSI_QUOTES might be a subset of sql_mode, for example // ANSI_QUOTES might be a subset of sql_mode, for example
// REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI // REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
if (false !== strpos($server_sql_mode, 'ANSI_QUOTES')) { if (false !== strpos($server_sql_mode, 'ANSI_QUOTES')) {
$table_delimiter = 'quote_double'; $table_delimiter = 'quote_double';
@@ -1008,7 +1008,7 @@ class PMA_Table
* *
* @param string new table name * @param string new table name
* @param string new database name * @param string new database name
* @param boolean is this for a VIEW rename? * @param boolean is this for a VIEW rename?
* @return boolean success * @return boolean success
*/ */
function rename($new_name, $new_db = null, $is_view = false) function rename($new_name, $new_db = null, $is_view = false)
@@ -1045,7 +1045,7 @@ class PMA_Table
} }
// I don't think a specific error message for views is necessary // I don't think a specific error message for views is necessary
if (! PMA_DBI_query($GLOBALS['sql_query'])) { if (! PMA_DBI_query($GLOBALS['sql_query'])) {
$this->errors[] = sprintf(__('Error renaming table %1 to %2'), $this->getFullName(), $new_table->getFullName()); $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName());
return false; return false;
} }

4
libraries/common.inc.php
View File

@@ -591,7 +591,7 @@ if ($GLOBALS['PMA_Config']->error_config_file) {
trigger_error($error, E_USER_ERROR); trigger_error($error, E_USER_ERROR);
} }
if ($GLOBALS['PMA_Config']->error_config_default_file) { if ($GLOBALS['PMA_Config']->error_config_default_file) {
$error = sprintf(__('Could not load default configuration from: %1'), $error = sprintf(__('Could not load default configuration from: %1$s'),
$GLOBALS['PMA_Config']->default_source); $GLOBALS['PMA_Config']->default_source);
trigger_error($error, E_USER_ERROR); trigger_error($error, E_USER_ERROR);
} }
@@ -633,7 +633,7 @@ if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
// Don't use servers with no hostname // Don't use servers with no hostname
if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) { if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) {
trigger_error(sprintf(__('Invalid hostname for server %1. Please review your configuration.'), $server_index), E_USER_ERROR); trigger_error(sprintf(__('Invalid hostname for server %1$s. Please review your configuration.'), $server_index), E_USER_ERROR);
} }
// Final solution to bug #582890 // Final solution to bug #582890