diff --git a/ChangeLog b/ChangeLog
index 6c8985926..6304e7f52 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-10-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/display_tbl.lib.php3: bug 830437, undefined $sql_order
 
 2003-10-24 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/lithuanian: Updated, thanks to Vilius Zigmantas (viliusz).
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index d91132a88..a9d82d85a 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -544,7 +544,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                 echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
                 echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;';
                 $used_index = false;
-                $local_order = str_replace('  ', ' ', $sql_order);
+                $local_order = (isset($sql_order) ? str_replace('  ', ' ', $sql_order) : '');
                 while (list($key, $val) = each($indexes_data)) {
                     $asc_sort = 'ORDER BY ';
                     $desc_sort = 'ORDER BY ';