Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -62,8 +62,9 @@ phpMyAdmin - ChangeLog
 - bug #4557 PHP fatal error, undefined function __()
 - bug #4568 Date displayed incorrectly when charting a timeline
 - bug #4571 Database Privileges link does not work
+- bug       makegrid.js: where_clause is undefined
 
-4.2.10.1 (not yet released)
+4.2.10.1 (2014-10-21)
 - bug #4562 [security] XSS in debug SQL output
 - bug #4563 [security] XSS in monitor query analyzer
 

js/makegrid.js

@@ -1114,6 +1114,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $('td.to_be_saved').parents('tr').each(function () {
                 var $tr = $(this);
                 var where_clause = $tr.find('.where_clause').val();
+                if (typeof where_clause === 'undefined') {
+                    where_clause = '';
+                }
                 full_where_clause.push(PMA_urldecode(where_clause));
                 var condition_array = jQuery.parseJSON($tr.find('.condition_array').val());