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

$cfg['PropertiesIconic'] is checked inside PMA_buttonOrImage()

Browse Source
This commit is contained in:
Sebastian Mendel
2007-09-27 14:48:12 +00:00
parent 669a3c2d87
commit caf61599cf
2 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/display_tbl.lib.php
View File

@@ -1992,7 +1992,6 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
.$uncheckall_link . "\n"
.'<i>' . $GLOBALS['strWithChecked'] . '</i>' . "\n";
if ($GLOBALS['cfg']['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit',
'submit_mult_change', $GLOBALS['strChange'], 'b_edit.png');
PMA_buttonOrImage('submit_mult', 'mult_submit',
@@ -2003,19 +2002,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
'b_tblexport.png');
}
echo "\n";
} else {
echo ' <input type="submit" name="submit_mult"'
.' value="' . htmlspecialchars($GLOBALS['strEdit']) . '"'
.' title="' . $GLOBALS['strEdit'] . '" />' . "\n";
echo ' <input type="submit" name="submit_mult"'
.' value="' . htmlspecialchars($delete_text) . '"'
.' title="' . $delete_text . '" />' . "\n";
if ($analyzed_sql[0]['querytype'] == 'SELECT') {
echo ' <input type="submit" name="submit_mult"'
.' value="' . htmlspecialchars($GLOBALS['strExport']) . '"'
.' title="' . $GLOBALS['strExport'] . '" />' . "\n";
}
}
echo '<input type="hidden" name="sql_query"'
.' value="' . htmlspecialchars($sql_query) . '" />' . "\n";
echo '<input type="hidden" name="url_query"'

23
tbl_structure.php
View File

@@ -493,13 +493,9 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
<i><?php echo $strWithChecked; ?></i>
<?php
if ($cfg['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', $strBrowse, 'b_browse.png');
} else {
echo '<input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n";
}
if (! $tbl_is_view && ! $db_is_information_schema) {
if ($cfg['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $strChange, 'b_edit.png');
// Drop button if there is at least two fields
if ($fields_cnt > 1) {
@@ -511,23 +507,6 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png');
}
} else {
// Drop button if there is at least two fields
if ($fields_cnt > 1) {
echo '<i>' . $strOr . '</i>' . "\n"
. '<input type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '" />' . "\n";
}
echo '<i>' . $strOr . '</i>' . "\n"
. '<input type="submit" name="submit_mult" value="' . $strPrimary . '" title="' . $strPrimary . '" />' . "\n";
echo '<i>' . $strOr . '</i>' . "\n"
. '<input type="submit" name="submit_mult" value="' . $strIndex . '" title="' . $strIndex . '" />' . "\n";
echo '<i>' . $strOr . '</i>' . "\n"
. '<input type="submit" name="submit_mult" value="' . $strUnique . '" title="' . $strUnique . '" />' . "\n";
if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) {
echo '<i>' . $strOr . '</i>' . "\n"
. '<input type="submit" name="submit_mult" value="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" />' . "\n";
}
}
}
?>
</form>