UPDATE 4.4.6.04.4.6.0

50 files changed, 40 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 5be0385f82..845ff73021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.4.6.0 (2015-05-07)
+- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
+- bug #4892 Undefined variable: unique_conditions
+- bug #4891 CSV Import ignores "Replace table data with file" checkbox
+
 4.4.5.0 (2015-05-05)
 - bug       Table overhead stats: missing space before the unit
 - bug       Fix resize icon in Designer
diff --git a/README b/README
index 8e6bd32520..2565996c2d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.4.5
+Version 4.4.6
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/js/error_report.js b/js/error_report.js
index 791f1aa324..b98993afa7 100644
--- a/js/error_report.js
+++ b/js/error_report.js
@@ -257,9 +257,11 @@ var ErrorReport = {
      */
     wrap_global_functions: function () {
         for (var key in window) {
-            var global = window[key];
-            if (typeof(global) === "function" && key.indexOf("PMA_") === 0) {
-                window[key] = ErrorReport.wrap_function(global);
+            if (key.indexOf("PMA_") === 0) {
+                var global = window[key];
+                if (typeof(global) === "function") {
+                    window[key] = ErrorReport.wrap_function(global);
+                }
             }
         }
     },
diff --git a/js/line_counts.php b/js/line_counts.php
index ba58e0cd0d..0f9bad20f3 100644
--- a/js/line_counts.php
+++ b/js/line_counts.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
 define('LINE_COUNTS', true);
 $LINE_COUNT = array();
 
-$LINE_COUNT["error_report.js"] = 338;
+$LINE_COUNT["error_report.js"] = 340;
 $LINE_COUNT["functions.js"] = 4545;
 $LINE_COUNT["db_central_columns.js"] = 200;
 $LINE_COUNT["jquery/jquery-ui-timepicker-addon.js"] = 2223;
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9b7fba0dc4..719312dc32 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.4.5');
+        $this->set('PMA_VERSION', '4.4.6');
         /**
          * @deprecated
          */
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 217fd784f8..c6ac22c894 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -2839,7 +2839,7 @@ class PMA_DisplayResults
 
         $row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
 
-        $previousMetaOrgTable = '';
+        $uniqueConditionMap = array();
 
         $columnCount = $this->__get('fields_cnt');
         for ($currentColumn = 0;
@@ -2993,8 +2993,7 @@ class PMA_DisplayResults
              * costly and does not need to be called if we already know
              * the conditions for the current table.
              */
-
-            if ($meta->orgtable != $previousMetaOrgTable) {
+            if (! isset($uniqueConditionMap[$meta->orgtable])) {
                 $unique_conditions = PMA_Util::getUniqueCondition(
                     $dt_result,
                     $this->__get('fields_cnt'),
@@ -3003,13 +3002,13 @@ class PMA_DisplayResults
                     false,
                     $meta->orgtable
                 );
-                $previousMetaOrgTable = $meta->orgtable;
+                $uniqueConditionMap[$meta->orgtable] = $unique_conditions;
             }
 
             $transform_url_params = array(
                 'db'            => $this->__get('db'),
                 'table'         => $meta->orgtable,
-                'where_clause'  => $unique_conditions[0],
+                'where_clause'  => $uniqueConditionMap[$meta->orgtable][0],
                 'transform_key' => $meta->orgname
             );
 
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index 7964717975..6a5d1b0892 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -215,7 +215,11 @@ function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname,
     $description, $title
 ) {
     $keyname = htmlspecialchars($keyname);
-    $output = '<td ' . $cssClass . '>'
+    $output = '<td';
+    if (! empty($cssClass)) {
+        $output .= ' ' . $cssClass;
+    }
+    $output .= '>'
         . ($isSelected ? '<strong>' : '')
         . '<a class="foreign_value" data-key="' . $keyname . '" '
         . 'href="#" title="' . __('Use this value')
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index b880c648e4..1fac1cf293 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -334,7 +334,8 @@ $strConfigImport_csv_col_names_name = __('Lines terminated with');
 $strConfigImport_csv_enclosed_name = __('Columns enclosed with');
 $strConfigImport_csv_escaped_name = __('Columns escaped with');
 $strConfigImport_csv_ignore_name = __('Do not abort on INSERT error');
-$strConfigImport_csv_replace_name = __('Replace table data with file');
+$strConfigImport_csv_replace_name = __('Add ON DUPLICATE KEY UPDATE');
+$strConfigImport_csv_replace_desc = __('Update data when duplicate keys found on import');
 $strConfigImport_csv_terminated_name = __('Columns terminated with');
 $strConfigImport_format_desc = __(
     'Default format; be aware that this list depends on location (database, table) '
@@ -345,7 +346,8 @@ $strConfigImport_ldi_enclosed_name = __('Columns enclosed with');
 $strConfigImport_ldi_escaped_name = __('Columns escaped with');
 $strConfigImport_ldi_ignore_name = __('Do not abort on INSERT error');
 $strConfigImport_ldi_local_option_name = __('Use LOCAL keyword');
-$strConfigImport_ldi_replace_name = __('Replace table data with file');
+$strConfigImport_ldi_replace_name = __('Add ON DUPLICATE KEY UPDATE');
+$strConfigImport_ldi_replace_desc = __('Update data when duplicate keys found on import');
 $strConfigImport_ldi_terminated_name = __('Columns terminated with');
 $strConfigImport_ods_col_names_name = __('Column names in first row');
 $strConfigImport_ods_empty_rows_name = __('Do not import empty rows');
@@ -453,7 +455,7 @@ $strConfigNavigationTreeDisplayItemFilterMinimum_name
 $strConfigNavigationTreeDisplayDbFilterMinimum_name
     = __('Minimum number of databases to display the database filter box');
 $strConfigNavigationTreeEnableGrouping_desc = __(
-    'Group items in the navigation tree (determined by the separator defined below).'
+    'Group items in the navigation tree (determined by the separator defined in the Databases and Tables tabs above).'
 );
 $strConfigNavigationTreeEnableGrouping_name = __('Group items in the tree');
 $strConfigNavigationTreeDbSeparator_desc
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index b245be971b..1aeb328ca9 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -769,7 +769,7 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
         . ' cols="' . $textareaCols . '"'
         . ' dir="' . $text_dir . '"'
         . ' id="field_' . ($idindex) . '_3"'
-        . ' ' . $unnullify_trigger
+        . (! empty($unnullify_trigger) ? ' ' . $unnullify_trigger : '')
         . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
         . ' data-type="' . $data_type . '">'
         . $special_chars_encoded
diff --git a/libraries/language_stats.inc.php b/libraries/language_stats.inc.php
index 34e2e58695..584ff9a569 100644
--- a/libraries/language_stats.inc.php
+++ b/libraries/language_stats.inc.php
@@ -9,20 +9,20 @@ $GLOBALS["language_stats"] = array (
     'be@latin' => 26,
     'be' => 27,
     'bg' => 62,
-    'bn' => 83,
+    'bn' => 82,
     'br' => 19,
     'bs' => 14,
-    'ca' => 100,
+    'ca' => 99,
     'ckb' => 17,
     'cs' => 96,
     'cy' => 19,
     'da' => 99,
-    'de' => 100,
+    'de' => 99,
     'el' => 100,
     'en_GB' => 88,
     'eo' => 2,
-    'es' => 99,
-    'et' => 100,
+    'es' => 98,
+    'et' => 99,
     'eu' => 17,
     'fa' => 27,
     'fi' => 63,
@@ -34,9 +34,9 @@ $GLOBALS["language_stats"] = array (
     'hr' => 32,
     'hu' => 100,
     'hy' => 3,
-    'ia' => 68,
+    'ia' => 69,
     'id' => 73,
-    'it' => 100,
+    'it' => 99,
     'ja' => 73,
     'ka' => 15,
     'kk' => 10,
@@ -57,14 +57,14 @@ $GLOBALS["language_stats"] = array (
     'nl' => 100,
     'pa' => 2,
     'pl' => 86,
-    'pt_BR' => 100,
+    'pt_BR' => 99,
     'pt' => 59,
-    'ro' => 59,
+    'ro' => 58,
     'ru' => 96,
     'si' => 65,
     'sk' => 84,
-    'sl' => 100,
-    'sq' => 100,
+    'sl' => 99,
+    'sq' => 99,
     'sr@latin' => 50,
     'sr' => 25,
     'sv' => 88,
diff --git a/libraries/plugins/import/AbstractImportCsv.class.php b/libraries/plugins/import/AbstractImportCsv.class.php
index fbc891767e..451d245e25 100644
--- a/libraries/plugins/import/AbstractImportCsv.class.php
+++ b/libraries/plugins/import/AbstractImportCsv.class.php
@@ -52,7 +52,7 @@ abstract class AbstractImportCsv extends ImportPlugin
         // create common items and add them to the group
         $leaf = new BoolPropertyItem();
         $leaf->setName("replace");
-        $leaf->setText(__('Replace table data with file'));
+        $leaf->setText(__('Update data when duplicate keys found on import (add ON DUPLICATE KEY UPDATE)'));
         $generalOptions->addProperty($leaf);
         $leaf = new TextPropertyItem();
         $leaf->setName("terminated");
diff --git a/locale/az/LC_MESSAGES/phpmyadmin.mo b/locale/az/LC_MESSAGES/phpmyadmin.mo
index 16de08238e..6d082b85ab 100644
--- a/locale/az/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/az/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/bg/LC_MESSAGES/phpmyadmin.mo b/locale/bg/LC_MESSAGES/phpmyadmin.mo
index 1cdf68114a..1c17ab7450 100644
--- a/locale/bg/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/bg/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/bn/LC_MESSAGES/phpmyadmin.mo b/locale/bn/LC_MESSAGES/phpmyadmin.mo
index f55129943e..110cd0ad33 100644
--- a/locale/bn/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/bn/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ca/LC_MESSAGES/phpmyadmin.mo b/locale/ca/LC_MESSAGES/phpmyadmin.mo
index bba34c469c..0727988e17 100644
--- a/locale/ca/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ca/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/cs/LC_MESSAGES/phpmyadmin.mo b/locale/cs/LC_MESSAGES/phpmyadmin.mo
index 1294a4cf07..17f8be36b2 100644
--- a/locale/cs/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/cs/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/da/LC_MESSAGES/phpmyadmin.mo b/locale/da/LC_MESSAGES/phpmyadmin.mo
index c74bedc699..ff5a95739d 100644
--- a/locale/da/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/da/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/de/LC_MESSAGES/phpmyadmin.mo b/locale/de/LC_MESSAGES/phpmyadmin.mo
index 656a91ae52..319c87729d 100644
--- a/locale/de/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/de/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/el/LC_MESSAGES/phpmyadmin.mo b/locale/el/LC_MESSAGES/phpmyadmin.mo
index 75b4d63b35..b2e2bad627 100644
--- a/locale/el/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/el/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/en_GB/LC_MESSAGES/phpmyadmin.mo b/locale/en_GB/LC_MESSAGES/phpmyadmin.mo
index 3c9742768c..7655b0071c 100644
--- a/locale/en_GB/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/en_GB/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/es/LC_MESSAGES/phpmyadmin.mo b/locale/es/LC_MESSAGES/phpmyadmin.mo
index 2280676dab..2bfe66806f 100644
--- a/locale/es/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/es/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/et/LC_MESSAGES/phpmyadmin.mo b/locale/et/LC_MESSAGES/phpmyadmin.mo
index 18496e805d..02671f7291 100644
--- a/locale/et/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/et/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/fi/LC_MESSAGES/phpmyadmin.mo b/locale/fi/LC_MESSAGES/phpmyadmin.mo
index e604827fd6..e304a100a4 100644
--- a/locale/fi/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/fi/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/fr/LC_MESSAGES/phpmyadmin.mo b/locale/fr/LC_MESSAGES/phpmyadmin.mo
index b34e7511fb..19d80d64e7 100644
--- a/locale/fr/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/fr/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/gl/LC_MESSAGES/phpmyadmin.mo b/locale/gl/LC_MESSAGES/phpmyadmin.mo
index f0bf352486..5218359103 100644
--- a/locale/gl/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/gl/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/hi/LC_MESSAGES/phpmyadmin.mo b/locale/hi/LC_MESSAGES/phpmyadmin.mo
index a3eebf36ee..4c3bd46226 100644
--- a/locale/hi/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/hi/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/hu/LC_MESSAGES/phpmyadmin.mo b/locale/hu/LC_MESSAGES/phpmyadmin.mo
index 11cc65c916..72c52e6fa2 100644
--- a/locale/hu/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/hu/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ia/LC_MESSAGES/phpmyadmin.mo b/locale/ia/LC_MESSAGES/phpmyadmin.mo
index b48cd78c02..1a26aa6a06 100644
--- a/locale/ia/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ia/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/id/LC_MESSAGES/phpmyadmin.mo b/locale/id/LC_MESSAGES/phpmyadmin.mo
index 88c928e3a5..45bf015925 100644
--- a/locale/id/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/id/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/it/LC_MESSAGES/phpmyadmin.mo b/locale/it/LC_MESSAGES/phpmyadmin.mo
index 70351da356..685d581f91 100644
--- a/locale/it/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/it/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ja/LC_MESSAGES/phpmyadmin.mo b/locale/ja/LC_MESSAGES/phpmyadmin.mo
index 320d9b7a2c..615e984584 100644
--- a/locale/ja/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ja/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ko/LC_MESSAGES/phpmyadmin.mo b/locale/ko/LC_MESSAGES/phpmyadmin.mo
index 16adf9bc9c..4849319bab 100644
--- a/locale/ko/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ko/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/lt/LC_MESSAGES/phpmyadmin.mo b/locale/lt/LC_MESSAGES/phpmyadmin.mo
index dfc2a681dc..bb970665c8 100644
--- a/locale/lt/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/lt/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/nb/LC_MESSAGES/phpmyadmin.mo b/locale/nb/LC_MESSAGES/phpmyadmin.mo
index d4b71c3900..64d743f911 100644
--- a/locale/nb/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/nb/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/nl/LC_MESSAGES/phpmyadmin.mo b/locale/nl/LC_MESSAGES/phpmyadmin.mo
index 3db97fb268..d892a55ef0 100644
--- a/locale/nl/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/nl/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/pl/LC_MESSAGES/phpmyadmin.mo b/locale/pl/LC_MESSAGES/phpmyadmin.mo
index 6a8ad9128b..b05dba3dcc 100644
--- a/locale/pl/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/pl/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/pt/LC_MESSAGES/phpmyadmin.mo b/locale/pt/LC_MESSAGES/phpmyadmin.mo
index 1353180d17..ac83214f92 100644
--- a/locale/pt/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/pt/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo b/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo
index 34fb636c67..1025065608 100644
--- a/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ro/LC_MESSAGES/phpmyadmin.mo b/locale/ro/LC_MESSAGES/phpmyadmin.mo
index b5ffd0bbea..2bd9f6b350 100644
--- a/locale/ro/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ro/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/ru/LC_MESSAGES/phpmyadmin.mo b/locale/ru/LC_MESSAGES/phpmyadmin.mo
index dbd46cbe9a..9060310cf1 100644
--- a/locale/ru/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ru/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/si/LC_MESSAGES/phpmyadmin.mo b/locale/si/LC_MESSAGES/phpmyadmin.mo
index 7cd668fb2e..dc65492b02 100644
--- a/locale/si/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/si/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/sk/LC_MESSAGES/phpmyadmin.mo b/locale/sk/LC_MESSAGES/phpmyadmin.mo
index 392fcb7d34..42f576e67e 100644
--- a/locale/sk/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/sk/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/sl/LC_MESSAGES/phpmyadmin.mo b/locale/sl/LC_MESSAGES/phpmyadmin.mo
index edda3bb79a..2aa213729d 100644
--- a/locale/sl/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/sl/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/sq/LC_MESSAGES/phpmyadmin.mo b/locale/sq/LC_MESSAGES/phpmyadmin.mo
index 6a24be055d..8173221459 100644
--- a/locale/sq/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/sq/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo b/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo
index 117fa08704..03438d2e11 100644
--- a/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/sv/LC_MESSAGES/phpmyadmin.mo b/locale/sv/LC_MESSAGES/phpmyadmin.mo
index 27409453b0..45078818d6 100644
--- a/locale/sv/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/sv/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/tr/LC_MESSAGES/phpmyadmin.mo b/locale/tr/LC_MESSAGES/phpmyadmin.mo
index 76784bc2f4..a38cf5618d 100644
--- a/locale/tr/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/tr/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/uk/LC_MESSAGES/phpmyadmin.mo b/locale/uk/LC_MESSAGES/phpmyadmin.mo
index e47f00480a..7fc8b09770 100644
--- a/locale/uk/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/uk/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo b/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo
index ece1df8f78..c2c8c6b50e 100644
--- a/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo
diff --git a/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo b/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo
index 55ad386c39..f20f766431 100644
--- a/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo