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

merged Michal fix

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-11-16 10:07:01 +00:00
parent 597f7ed4e2
commit e47994fee3
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-11-16 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_indexes.php3: merged Michal fix.
2001-11-15 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-11-15 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/tbl_dump.php3 : merged a workaround against the IE downloading * libraries/tbl_dump.php3 : merged a workaround against the IE downloading
bug with SSL. bug with SSL.

19
tbl_indexes.php3
View File

@@ -224,24 +224,27 @@ else if (!defined('_IDX_INCLUDED_')
if (!isset($index)) { if (!isset($index)) {
$index = ''; $index = '';
} }
if (!isset($old_index)){
$old_index = $index;
}
if (!isset($index_type)) { if (!isset($index_type)) {
$index_type = ''; $index_type = '';
} }
if ($index == '' || !isset($indexes_info[$index])) { if ($old_index == '' || !isset($indexes_info[$old_index])) {
$edited_index_info['Sequences'] = array(); $edited_index_info['Sequences'] = array();
$edited_index_data = array(); $edited_index_data = array();
for ($i = 1; $i <= $idx_num_fields; $i++) { for ($i = 1; $i <= $idx_num_fields; $i++) {
$edited_index_info['Sequences'][] = $i; $edited_index_info['Sequences'][] = $i;
$edited_index_data[$i] = array('Column_name' => '', 'Sub_part' => ''); $edited_index_data[$i] = array('Column_name' => '', 'Sub_part' => '');
} // end for } // end for
if ($index == '' if ($old_index == ''
&& !isset($indexes_info['PRIMARY']) && !isset($indexes_info['PRIMARY'])
&& ($index_type == '' || $index_type == 'PRIMARY')) { && ($index_type == '' || $index_type == 'PRIMARY')) {
$index = 'PRIMARY'; $old_index = 'PRIMARY';
} }
} else { } else {
$edited_index_info = $indexes_info[$index]; $edited_index_info = $indexes_info[$old_index];
$edited_index_data = $indexes_data[$index]; $edited_index_data = $indexes_data[$old_index];
if ($edited_index_info['Comment'] == 'FULLTEXT') { if ($edited_index_info['Comment'] == 'FULLTEXT') {
$index_type = 'FULLTEXT'; $index_type = 'FULLTEXT';
} else if ($index == 'PRIMARY') { } else if ($index == 'PRIMARY') {
@@ -287,7 +290,7 @@ else if (!defined('_IDX_INCLUDED_')
} }
echo "\n"; echo "\n";
?> ?>
<input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : $index); ?>" /> <input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : $old_index); ?>" />
<b><?php echo '------ ' . (isset($create_index) ? $strCreateIndexTopic : $strModifyIndexTopic) . ' ------'; ?></b> <b><?php echo '------ ' . (isset($create_index) ? $strCreateIndexTopic : $strModifyIndexTopic) . ' ------'; ?></b>
<br /><br /> <br /><br />
@@ -428,8 +431,8 @@ else if (!defined('_IDX_INCLUDED_')
. ' ' . $index_type . "\n" . ' ' . $index_type . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
echo $index_td echo str_replace('">' . "\n", '" align="right">' . "\n", $index_td)
. ' ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . "\n" . ' ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . '&nbsp;' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
if ($index_name == 'PRIMARY') { if ($index_name == 'PRIMARY') {