diff --git a/ChangeLog b/ChangeLog index a0ae0e851..751b0c100 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ $Source$ * db_details.php3, lines 719-720; lang/*: cleanup. * tbl_properties.php3, line 769; lang/*: changed $strAfter to allow valid translations whatever is the words order. + * display_tlb.lib.php3, lines 1235-1237: fixed a warning. 2002-01-25 Marc Delisle * Documentation.html: FAQ about compressed dumps diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index b569de9d0..d21da4e81 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -1232,12 +1232,12 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ // (see the 'relation' config variable) // (currently not available for PHP3 due to spliti() ) + // init map + $map = array(); + if (PMA_PHP_INT_VERSION >= 40000 && isset($cfgServer['relation']) && !empty($cfgServer['relation'])) { - - // init map - $map = array(); // find tables $tabs = '(\'' . join('\',\'', spliti('`? *((on [^,]+)?,|(NATURAL )?(inner|left|right)( outer)? join) *`?', eregi_replace('^.*FROM +`?|`? *(on [^,]+)?(WHERE.*)?$', '', $sql_query))) . '\')';