diff --git a/ChangeLog b/ChangeLog
index c03087d00..36923b784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2007-02-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: bug #1667466, undefined variable when
+      export + save on server
+
 2007-02-24 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/config.default.php: RFE #1621437, HEX and UNHEX were not
       available for a BINARY field
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 27684f80c..9cb2c8d82 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1185,8 +1185,11 @@ if (typeof(window.parent) != 'undefined'
                 $sql_query = $GLOBALS['display_query'];
             } elseif ($cfg['SQP']['fmtType'] == 'none' && ! empty($GLOBALS['unparsed_sql'])) {
                 $sql_query = $GLOBALS['unparsed_sql'];
-            } else {
+            // could be empty, for example export + save on server
+            } elseif (! empty($GLOBALS['sql_query'])) {
                 $sql_query = $GLOBALS['sql_query'];
+            } else {
+                $sql_query = '';
             }
         }