Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
 + rfe #1146 Show original size of truncated columns
 
 4.4.6.0 (not yet released)
+- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
 
 4.4.5.0 (2015-05-05)
 - bug       Table overhead stats: missing space before the unit

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);
+                }
             }
         }
     },