diff --git a/ChangeLog b/ChangeLog
index 7ab83310b..27370fa89 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2003-10-21 Marc Delisle  <lem9@users.sourceforge.net>
     * pdf_pages.php3: Patch 825672: show fields in Edit PDF scratchboard,
       thanks to Chris Walsh (chriswalshaz)
+    * libraries/display_tbl.lib.php3: bug 826847, undefined $url_query
 
 2003-10-20 Michal Cihar  <nijel@users.sourceforge.net>
     * Documentation, config.inc.php3, tbl_change.php3,
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index fc4a0139b..87a2cfa81 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1474,7 +1474,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             echo (($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') ? "\n" : '');
             $row_no++;
         } // end while
-        $GLOBALS['url_query'] = $url_query;
+
+        if (isset($url_query)) {
+            $GLOBALS['url_query'] = $url_query;
+        }
 
         return TRUE;
     } // end of the 'PMA_displayTableBody()' function