bug 636553

This commit is contained in:
Marc Delisle
2002-11-13 19:13:00 +00:00
parent 84c31358f3
commit f7fb4c903d
2 changed files with 4 additions and 2 deletions

View File

@@ -9,6 +9,7 @@ $Source$
* libraries/sqlparser.lib.php3: bug 636575 (unquoted identifiers)
* libraries/sqlparser.lib.php3, libraries/common.lib.php3, sql.php3:
bug 636563 undefined variable when deleting a row
* libraries/sqlparser.lib.php3: bug 636553 SELECT VERSION()
2002-11-11 Alexander M. Turek <rabus@users.sourceforge.net>
* libaries/common.lib.php3: Fixed bug #636345 (Error when modifying table

View File

@@ -2,6 +2,7 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
error_reporting(E_ALL);
/** SQL Parser Functions for phpMyAdmin
*
* Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
@@ -869,7 +870,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// for each table_ref alias, put the true name of the table
// in the corresponding select expressions
if ($seen_end_of_table_ref || $i == $size-1) {
if (isset($current_table_ref) && ($seen_end_of_table_ref || $i == $size-1)) {
for ($tr=0; $tr <= $current_table_ref; $tr++) {
$alias = $subresult['table_ref'][$tr]['table_alias'];
$truename = $subresult['table_ref'][$tr]['table_true_name'];
@@ -925,7 +926,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// to be able to save the last table ref, but do not
// set it true if we found a word like "ON" that has
// already set it to false
if ($save_table_ref != FALSE) {
if (isset($save_table_ref) && $save_table_ref != FALSE) {
$save_table_ref = TRUE;
} //end if