diff --git a/ChangeLog b/ChangeLog
index 56bf4fa22..8e9815d41 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $Source$
     * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
     * lang/galician: Updates, thanks to Xosé Calvo.
     * new language: belarusian, thanks to Jaska Zedlik <jz53 at zedlik.com>
+    * tbl_properties_export.php: bug #1180860, error going from Export
+      to Insert tab
 
 2005-04-14 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php: Search icon centering
diff --git a/tbl_properties_export.php b/tbl_properties_export.php
index 7bce9cca3..b6f902c09 100644
--- a/tbl_properties_export.php
+++ b/tbl_properties_export.php
@@ -38,7 +38,8 @@ if (isset($sql_query)) {
         if (!empty($analyzed_sql[0]['from_clause'])) {
             $sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause'];
         }
-        if (isset($primary_key)) {
+
+        if (isset($primary_key) && is_array($primary_key)) {
             $sql_query .= ' WHERE ';
             $conj = '';
             foreach ($primary_key AS $i => $key) {