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

Do not pass translated strings as parameter.

Browse Source 
This can cause problem for non ascii languages and breaks if user
meanwhile switches language.
This commit is contained in:
Michal Čihař
2011-03-18 14:32:36 +01:00
parent 65e53a8bb8
commit fc965daabd
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
db_structure.php
View File

@@ -499,23 +499,23 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db);
<?php <?php
echo ' <option value="' . __('With selected:') . '" selected="selected">' echo ' <option value="' . __('With selected:') . '" selected="selected">'
. __('With selected:') . '</option>' . "\n"; . __('With selected:') . '</option>' . "\n";
echo ' <option value="' . __('Export') . '" >' echo ' <option value="export" >'
. __('Export') . '</option>' . "\n"; . __('Export') . '</option>' . "\n";
echo ' <option value="' . __('Print view') . '" >' echo ' <option value="' . __('Print view') . '" >'
. __('Print view') . '</option>' . "\n"; . __('Print view') . '</option>' . "\n";
if (!$db_is_information_schema) { if (!$db_is_information_schema) {
echo ' <option value="' . __('Empty') . '" >' echo ' <option value="empty_tbl" >'
. __('Empty') . '</option>' . "\n"; . __('Empty') . '</option>' . "\n";
echo ' <option value="' . __('Drop') . '" >' echo ' <option value="drop_tbl" >'
. __('Drop') . '</option>' . "\n"; . __('Drop') . '</option>' . "\n";
echo ' <option value="' . __('Check table') . '" >' echo ' <option value="check_tbl" >'
. __('Check table') . '</option>' . "\n"; . __('Check table') . '</option>' . "\n";
echo ' <option value="' . __('Optimize table') . '" >' echo ' <option value="optimize_tbl" >'
. __('Optimize table') . '</option>' . "\n"; . __('Optimize table') . '</option>' . "\n";
echo ' <option value="' . __('Repair table') . '" >' echo ' <option value="repair_tbl" >'
. __('Repair table') . '</option>' . "\n"; . __('Repair table') . '</option>' . "\n";
echo ' <option value="' . __('Analyze table') . '" >' echo ' <option value="analyze_tbl" >'
. __('Analyze table') . '</option>' . "\n"; . __('Analyze table') . '</option>' . "\n";
} }
?> ?>

34
libraries/mult_submits.inc.php
View File

@@ -30,35 +30,19 @@ if (! empty($submit_mult)
$selected = $selected_tbl; $selected = $selected_tbl;
switch ($submit_mult) { switch ($submit_mult) {
case 'drop_db': case 'drop_db':
$what = 'drop_db'; case 'drop_tbl':
case 'empty_tbl':
$what = $submit_mult;
break; break;
case __('Drop'): case 'check_tbl':
$what = 'drop_tbl'; case 'optimize_tbl':
break; case 'repair_tbl':
case __('Empty'): case 'analyze_tbl':
$what = 'empty_tbl'; $query_type = $submit_mult;
break;
case __('Check table'):
unset($submit_mult); unset($submit_mult);
$query_type = 'check_tbl';
$mult_btn = __('Yes'); $mult_btn = __('Yes');
break; break;
case __('Optimize table'): case 'export':
unset($submit_mult);
$query_type = 'optimize_tbl';
$mult_btn = __('Yes');
break;
case __('Repair table'):
unset($submit_mult);
$query_type = 'repair_tbl';
$mult_btn = __('Yes');
break;
case __('Analyze table'):
unset($submit_mult);
$query_type = 'analyze_tbl';
$mult_btn = __('Yes');
break;
case __('Export'):
unset($submit_mult); unset($submit_mult);
require('db_export.php'); require('db_export.php');
exit; exit;