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

Do not use strOr, drop file upload from normal SQL dialogs.

Browse Source
This commit is contained in:
Michal Čihař
2005-09-27 18:30:18 +00:00
parent 8f2db31c6a
commit c6044d36b4
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -24,6 +24,8 @@ $Source$
* lang/hebrew, translators.html: New Hebrew translation, thanks to Hadar * lang/hebrew, translators.html: New Hebrew translation, thanks to Hadar
Porat - hpman28. Porat - hpman28.
* lang/*: Add missing messages, remove duplicates and no longer used. * lang/*: Add missing messages, remove duplicates and no longer used.
* libraries/sql_query_form.lib.php: Do not use strOr, drop file upload
from normal SQL dialogs.
2005-09-26 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-09-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/database_interface.lib.php: fixed bug in PMA_DBI_fetch_*() * libraries/database_interface.lib.php: fixed bug in PMA_DBI_fetch_*()

10
libraries/sql_query_form.lib.php
View File

@@ -141,7 +141,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
} }
// display uploads // display uploads
if ( $display_tab === 'full' || $display_tab === 'files' ) { if ( $display_tab === 'files' ) {
if ( $GLOBALS['is_upload'] ) { if ( $GLOBALS['is_upload'] ) {
PMA_sqlQueryFormUpload( $display_tab ); PMA_sqlQueryFormUpload( $display_tab );
} }
@@ -366,7 +366,6 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
* @uses $GLOBALS['strDelete'] * @uses $GLOBALS['strDelete']
* @uses $GLOBALS['strDocu'] * @uses $GLOBALS['strDocu']
* @uses $GLOBALS['strGo'] * @uses $GLOBALS['strGo']
* @uses $GLOBALS['strOr']
* @uses $GLOBALS['strSubmit'] * @uses $GLOBALS['strSubmit']
* @uses $GLOBALS['strVar'] * @uses $GLOBALS['strVar']
* @uses count() * @uses count()
@@ -382,9 +381,6 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'; echo '<legend>';
if ( $display_tab == 'full' ) {
echo '<em>' . $GLOBALS['strOr'] . '</em> ';
}
echo $GLOBALS['strBookmarkQuery'] . '</legend>' . "\n"; echo $GLOBALS['strBookmarkQuery'] . '</legend>' . "\n";
echo '<div class="formelement">'; echo '<div class="formelement">';
echo '<select name="id_bookmark">' . "\n"; echo '<select name="id_bookmark">' . "\n";
@@ -451,7 +447,6 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
* @uses $GLOBALS['strGo'] * @uses $GLOBALS['strGo']
* @uses $GLOBALS['strGzip'] * @uses $GLOBALS['strGzip']
* @uses $GLOBALS['strLocationTextfile'] * @uses $GLOBALS['strLocationTextfile']
* @uses $GLOBALS['strOr']
* @uses $GLOBALS['strWebServerUploadDirectory'] * @uses $GLOBALS['strWebServerUploadDirectory']
* @uses $GLOBALS['strWebServerUploadDirectoryError'] * @uses $GLOBALS['strWebServerUploadDirectoryError']
* @uses $GLOBALS['allow_recoding'] * @uses $GLOBALS['allow_recoding']
@@ -500,9 +495,6 @@ function PMA_sqlQueryFormUpload( $display_tab = 'full' ) {
// start output // start output
echo '<fieldset id="">'; echo '<fieldset id="">';
echo '<legend>'; echo '<legend>';
if ( $display_tab == 'full' ) {
echo '<em>' . $GLOBALS['strOr'] . '</em> ';
}
echo $GLOBALS['strLocationTextfile'] . '</legend>'; echo $GLOBALS['strLocationTextfile'] . '</legend>';
echo '<div class="formelement">'; echo '<div class="formelement">';
echo '<input type="file" name="sql_file" class="textfield" /> '; echo '<input type="file" name="sql_file" class="textfield" /> ';