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

bug #1415465, undefined variable

Browse Source
This commit is contained in:
Marc Delisle
2006-02-04 18:38:42 +00:00
parent 617c2b4a03
commit 7e93c28871
6 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $Source$
Windows, thanks to Alex - nixniemand Windows, thanks to Alex - nixniemand
* libraries/mult_submits.inc.php, server_databases.php: array to string * libraries/mult_submits.inc.php, server_databases.php: array to string
conversion conversion
* tbl_properties_operations.php, tbl_properties.php, tbl_import.php,
tbl_change.php: bug #1415465, undefined $sql_query
2006-01-31 Marc Delisle <lem9@users.sourceforge.net> 2006-01-31 Marc Delisle <lem9@users.sourceforge.net>
* db_details_structure.php: bug #1412058, damaged table reporting * db_details_structure.php: bug #1412058, damaged table reporting

4
libraries/common.lib.php
View File

@@ -1875,7 +1875,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
$tab = array_merge($defaults, $tab); $tab = array_merge($defaults, $tab);
// determine aditional style-class // determine additionnal style-class
if (empty($tab['class'])) { if (empty($tab['class'])) {
if ($tab['text'] == $GLOBALS['strEmpty'] if ($tab['text'] == $GLOBALS['strEmpty']
|| $tab['text'] == $GLOBALS['strDrop']) { || $tab['text'] == $GLOBALS['strDrop']) {
@@ -1927,7 +1927,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
} }
return $out; return $out;
} // end of the 'PMA_printTab()' function } // end of the 'PMA_getTab()' function
/** /**
* returns html-code for a tab navigation * returns html-code for a tab navigation

3
tbl_change.php
View File

@@ -79,7 +79,8 @@ if (!empty($disp_message)) {
if (!isset($goto)) { if (!isset($goto)) {
$goto = 'db_details.php'; $goto = 'db_details.php';
} }
if (!preg_match('@^(db_details|tbl_properties|tbl_select)@', $goto)) { // TODO: check if we could replace by "db_details|tbl"
if (!preg_match('@^(db_details|tbl_properties|tbl_select|tbl_import)@', $goto)) {
$err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query); $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
} else { } else {
$err_url = $goto . '?' $err_url = $goto . '?'

2
tbl_import.php
View File

@@ -8,6 +8,8 @@ require_once('./libraries/common.lib.php');
* Gets tables informations and displays top links * Gets tables informations and displays top links
*/ */
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_properties_common.php');
$url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_properties_table_info.inc.php');
/** /**
* Displays top menu links * Displays top menu links

2
tbl_properties.php
View File

@@ -8,6 +8,8 @@ require_once('./libraries/common.lib.php');
* Runs common work * Runs common work
*/ */
require('./libraries/tbl_properties_common.php'); require('./libraries/tbl_properties_common.php');
$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php';
require_once('./libraries/sql_query_form.lib.php'); require_once('./libraries/sql_query_form.lib.php');
$err_url = 'tbl_properties.php' . $err_url; $err_url = 'tbl_properties.php' . $err_url;

1
tbl_properties_operations.php
View File

@@ -8,6 +8,7 @@ require_once('./libraries/common.lib.php');
* Runs common work * Runs common work
*/ */
require('./libraries/tbl_properties_common.php'); require('./libraries/tbl_properties_common.php');
$url_query .= '&amp;goto=tbl_properties_operations.php&amp;back=tbl_properties_operations.php';
/** /**
* Gets relation settings * Gets relation settings