diff --git a/ChangeLog b/ChangeLog index 247b48ee4..55c27d87f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-08-20 Alexander M. Turek + * sql.php3, libraries/sqlparser.lib.php3: Fixed bug #597184 (PHP3 + compatibility). + * libraries/common.lib.php3: Undefined variable. + 2002-08-17 Alexander M. Turek * main.php3: Fixed bug #596019 (Undefined variable $re). diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 58830a13e..748d93309 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -1086,6 +1086,7 @@ if (typeof(document.getElementById) != 'undefined' // Checks if the table needs to be repaired after a TRUNCATE query. if (PMA_MYSQL_INT_VERSION >= 40000 + && isset($GLOBALS['table']) && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) { if (!isset($tbl_status)) { $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\''); diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3 index 252991eb2..3a64199b8 100644 --- a/libraries/sqlparser.lib.php3 +++ b/libraries/sqlparser.lib.php3 @@ -196,7 +196,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { 9 => '||' ); $allpunct_list_pair_size = 10; //count($allpunct_list_pair); - $quote_list = "\'\"\`"; + $quote_list = '\'"`'; $arraysize = 0; while ($count2 < $len) { @@ -382,7 +382,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { $count2--; $punct_data = substr($sql, $count1, $count2 - $count1); } else { - $debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n" + $debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n" . 'STR: ' . $punct_data; PMA_SQP_throwError($debugstr, $sql); return $sql; @@ -418,7 +418,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { $is_float_digit = TRUE; continue; } else { - $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n" + $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n" . 'STR: ' . substr($sql, $count1, $count2 - $count1); PMA_SQP_throwError($debugstr, $sql); return $sql; @@ -485,8 +485,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { if ($arraysize > 0) { $t_next = $sql_array[0]['type']; - $t_prev = NULL; - $t_cur = NULL; + $t_prev = ''; + $t_cur = ''; } for ($i = 0; $i < $arraysize; $i++) { @@ -495,7 +495,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { if (($i + 1) < $arraysize) { $t_next = $sql_array[$i + 1]['type']; } else { - $t_next = NULL; + $t_next = ''; } if ($t_cur == 'alpha') { $t_suffix = '_identifier'; @@ -702,9 +702,9 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { $arraysize = $arr['len']; $typearr = array(); if ($arraysize >= 0) { - $typearr[0] = NULL; - $typearr[1] = NULL; - $typearr[2] = NULL; + $typearr[0] = ''; + $typearr[1] = ''; + $typearr[2] = ''; $typearr[3] = $arr[0]['type']; } @@ -724,7 +724,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { $typearr[4] = $arr[$i + 1]['type']; } else { //array_push($typearr, NULL); - $typearr[4] = NULL; + $typearr[4] = ''; } for ($j=0; $j<4; $j++) { diff --git a/sql.php3 b/sql.php3 index 7d1052693..23e92d417 100755 --- a/sql.php3 +++ b/sql.php3 @@ -562,7 +562,7 @@ else { . '&disp_direction=' . $disp_direction . '&repeat_cells=' . $repeat_cells . '&printview=1' - . (($dontlimitchars == '1') ? '&dontlimitchars=1' : '') + . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&dontlimitchars=1' : '') . '&sql_query=' . urlencode($sql_query); echo ' ' . "\n" . ' ' . $strPrintView . '' . "\n";