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

2
libraries/Table.class.php
View File

@@ -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