From 8b8f0c6d16b855972e2b84febf97a954aee592b7 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Fri, 2 May 2003 19:59:44 +0000
Subject: [PATCH] PHP3 compatibility

---
 ChangeLog                      | 1 +
 libraries/display_tbl.lib.php3 | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cebc29f22..0b8222df0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ $Source$
       altered the way the form is submitted in LeftFrameLight mode to
       keep the queryframe. Only if JavaScript is usable, otherwise it's
       not necessary to keep the 'opener' pointer.
+    * libraries/display_tbl.lib.php3: PHP3 compatibility.
 
 2003-04-30 Marc Delisle  <lem9@users.sourceforge.net>
     * pdf_schema.php3, bug 729517, better comment output,
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 08a182ae0..9fcb67782 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -441,7 +441,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
      *
      * @see     PMA_displayTable()
      */
-    function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $analyzed_sql = array())
+    function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $analyzed_sql = '')
     {
         global $lang, $convcharset, $server, $db, $table;
         global $goto;
@@ -449,6 +449,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         global $vertical_display, $disp_direction, $repeat_cells, $highlight_columns;
         global $dontlimitchars;
 
+        if ($analyzed_sql == '') {
+            $analyzed_sql = array();
+        }
+        
         if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
             ?>
 <!-- Results table headers -->
@@ -1088,7 +1092,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                         if (file_exists('./libraries/transformations/' . $include_file)) {
                             $transformfunction_name = str_replace('.inc.php3', '', $GLOBALS['mime_map'][$meta->name]['transformation']);
     
-                            @include('./libraries/transformations/' . $include_file);
+                            include('./libraries/transformations/' . $include_file);
     
                             if (defined('PMA_TRANSFORMATION_' . strtoupper($transformfunction_name)) && function_exists('PMA_transformation_' . $transformfunction_name)) {
                                 $transform_function = 'PMA_transformation_' . $transformfunction_name;