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

Reload language file after switch to utf-8 translation (bug #1442605).

Browse Source
This commit is contained in:
Michal Čihař
2006-04-27 12:32:11 +00:00
parent 9f8afc5d4e
commit f4e8e080d3
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -30,6 +30,9 @@ $Source$
* libraries/language.lib.php, libraries/common.lib.php, * libraries/language.lib.php, libraries/common.lib.php,
libraries/database_interface.lib.php, libraries/select_lang.lib.php: libraries/database_interface.lib.php, libraries/select_lang.lib.php:
Reload language file after switch to utf-8 translation (bug #1442605). Reload language file after switch to utf-8 translation (bug #1442605).
* tbl_properties_operations.php,
libraries/tbl_properties_table_info.inc.php: Allow to set PACK_KEYS to
DEFAULT (bug #1440966).
2006-04-26 Michal Čihař <michal@cihar.com> 2006-04-26 Michal Čihař <michal@cihar.com>
* libraries/plugin_interface.lib.php: * libraries/plugin_interface.lib.php:

3
libraries/tbl_properties_table_info.inc.php
View File

@@ -91,12 +91,15 @@ if ($table_info_result && PMA_DBI_num_rows($table_info_result) > 0) {
// export create options by its name as variables into gloabel namespace // export create options by its name as variables into gloabel namespace
// f.e. pack_keys=1 becomes available as $pack_keys with value of '1' // f.e. pack_keys=1 becomes available as $pack_keys with value of '1'
unset($pack_keys);
foreach ( $create_options as $each_create_option ) { foreach ( $create_options as $each_create_option ) {
$each_create_option = explode('=', $each_create_option); $each_create_option = explode('=', $each_create_option);
if ( isset( $each_create_option[1] ) ) { if ( isset( $each_create_option[1] ) ) {
$$each_create_option[0] = $each_create_option[1]; $$each_create_option[0] = $each_create_option[1];
} }
} }
// we need explicit DEFAULT value here (different from '0')
$pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
unset( $create_options, $each_create_option ); unset( $create_options, $each_create_option );
} // end if } // end if
?> ?>

22
tbl_properties_operations.php
View File

@@ -73,10 +73,8 @@ if (isset($_REQUEST['submitoptions'])) {
$l_tbl_type = strtolower($tbl_type); $l_tbl_type = strtolower($tbl_type);
$pack_keys = empty($pack_keys) ? '0' : '1';
$_REQUEST['new_pack_keys'] = empty($_REQUEST['new_pack_keys']) ? '0' : '1';
if (($l_tbl_type === 'myisam' || $l_tbl_type === 'isam') if (($l_tbl_type === 'myisam' || $l_tbl_type === 'isam')
&& $_REQUEST['new_pack_keys'] !== $pack_keys) { && $_REQUEST['new_pack_keys'] != (string)$pack_keys) {
$table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys']; $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys'];
} }
@@ -123,7 +121,7 @@ if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
if ($reread_info) { if ($reread_info) {
$pack_keys = $checksum = $delay_key_write = 0; $checksum = $delay_key_write = 0;
require './libraries/tbl_properties_table_info.inc.php'; require './libraries/tbl_properties_table_info.inc.php';
} }
unset($reread_info); unset($reread_info);
@@ -273,11 +271,17 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'ISAM') {
?> ?>
<tr> <tr>
<td><label for="new_pack_keys">pack_keys</label></td> <td><label for="new_pack_keys">pack_keys</label></td>
<td><input type="checkbox" name="new_pack_keys" id="new_pack_keys" <td><select name="new_pack_keys" id="new_pack_keys">
value="1" <option value="DEFAULT"
<?php echo (isset($pack_keys) && $pack_keys == 1) <?php if ($pack_keys == 'DEFAULT') echo 'selected="selected"'; ?>
? ' checked="checked"' >DEFAULT</option>
: ''; ?> /> <option value="0"
<?php if ($pack_keys == '0') echo 'selected="selected"'; ?>
>0</option>
<option value="1"
<?php if ($pack_keys == '1') echo 'selected="selected"'; ?>
>1</option>
</select>
</td> </td>
</tr> </tr>
<?php <?php