bug #1103201

ChangeLog

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-16 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: bug #1103201, wrong treatment of MySQL error
+      #1060 in the logic for error #1062
+
 2005-01-15 Alexander M. Turek  <me@derrabus.de>
     * server_links.inc.php, server_engines.php, lang/*.inc.php,
       libraries/storage_engines.php: Detailed storage engines status

libraries/common.lib.php

@@ -672,7 +672,10 @@ if ($is_minimum_common == FALSE) {
         // feature request #1036254:
         // Add a link by MySQL-Error #1062 - Duplicate entry
         // 2004-10-20 by mk.keck
-        if (strstr($tmp_mysql_error,"duplicate")) {
+        if (substr($error_message, 1, 4) == '1062') {
+        // TODO: do not assume that the error message is in English
+        // and do not use mysql_result()
+
             // explode the entry and the column
             $arr_mysql_val_key = explode('entry \'',$tmp_mysql_error);
             $arr_mysql_val_key = explode('\' for key',$arr_mysql_val_key[1]);