removed unneeded variable
This commit is contained in:
@@ -5,7 +5,10 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
2005-09-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
|
2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
|
||||||
|
* libraries/sql_query_form.lib.php: removed unneeded variable
|
||||||
|
|
||||||
|
2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
|
||||||
* libraries/sql_query_form.lib.php, db_details.php, server_sql.php
|
* libraries/sql_query_form.lib.php, db_details.php, server_sql.php
|
||||||
tbl_properties.php, tbl_properties_structure.php, sql.php,
|
tbl_properties.php, tbl_properties_structure.php, sql.php,
|
||||||
querywindow.php, read_dump.php: moved all code for queryboxes into
|
querywindow.php, read_dump.php: moved all code for queryboxes into
|
||||||
|
@@ -143,10 +143,8 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// display uploads
|
// display uploads
|
||||||
if ( $display_tab === 'files' ) {
|
if ( $display_tab === 'files' && $GLOBALS['is_upload'] ) {
|
||||||
if ( $GLOBALS['is_upload'] ) {
|
PMA_sqlQueryFormUpload();
|
||||||
PMA_sqlQueryFormUpload( $display_tab );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bookmark Support
|
// Bookmark Support
|
||||||
@@ -154,7 +152,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
|
|||||||
if ( ! empty( $GLOBALS['cfg']['Bookmark'] )
|
if ( ! empty( $GLOBALS['cfg']['Bookmark'] )
|
||||||
&& $GLOBALS['cfg']['Bookmark']['db']
|
&& $GLOBALS['cfg']['Bookmark']['db']
|
||||||
&& $GLOBALS['cfg']['Bookmark']['table'] ) {
|
&& $GLOBALS['cfg']['Bookmark']['table'] ) {
|
||||||
PMA_sqlQueryFormBookmark( $display_tab );
|
PMA_sqlQueryFormBookmark();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,9 +370,8 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
|
|||||||
* @uses $GLOBALS['strVar']
|
* @uses $GLOBALS['strVar']
|
||||||
* @uses count()
|
* @uses count()
|
||||||
* @uses htmlspecialchars()
|
* @uses htmlspecialchars()
|
||||||
* @param string $display_tab current tab displayed if in querywindow
|
|
||||||
*/
|
*/
|
||||||
function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
|
function PMA_sqlQueryFormBookmark() {
|
||||||
$bookmark_list = PMA_listBookmarks(
|
$bookmark_list = PMA_listBookmarks(
|
||||||
$GLOBALS['db'], $GLOBALS['cfg']['Bookmark'] );
|
$GLOBALS['db'], $GLOBALS['cfg']['Bookmark'] );
|
||||||
if ( count( $bookmark_list ) < 1 ) {
|
if ( count( $bookmark_list ) < 1 ) {
|
||||||
@@ -462,9 +459,8 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
|
|||||||
* @uses PMA_MYSQL_INT_VERSION
|
* @uses PMA_MYSQL_INT_VERSION
|
||||||
* @uses PMA_CSDROPDOWN_CHARSET
|
* @uses PMA_CSDROPDOWN_CHARSET
|
||||||
* @uses empty()
|
* @uses empty()
|
||||||
* @param string $display_tab current tab displayed if in querywindow
|
|
||||||
*/
|
*/
|
||||||
function PMA_sqlQueryFormUpload( $display_tab = 'full' ) {
|
function PMA_sqlQueryFormUpload() {
|
||||||
$errors = array ();
|
$errors = array ();
|
||||||
|
|
||||||
$matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here
|
$matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here
|
||||||
|
Reference in New Issue
Block a user