diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 2598f456..dbc89560 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -d9f16a4ed28aafc6c68a1fa4174e5e7ebf4d7181 +5163edd378fd86020a43a1b5a21ed8732bd92990 diff --git a/examples/server_side/scripts/ssp.class.php b/examples/server_side/scripts/ssp.class.php index 6d6ac91b..65845ebb 100644 --- a/examples/server_side/scripts/ssp.class.php +++ b/examples/server_side/scripts/ssp.class.php @@ -179,8 +179,8 @@ class SSP { if ( count( $columnSearch ) ) { $where = $where === '' ? - implode(' AND ', $globalSearch) : - $where .' AND '. implode(' AND ', $globalSearch); + implode(' AND ', $columnSearch) : + $where .' AND '. implode(' AND ', $columnSearch); } if ( $where !== '' ) { diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 5adb80c9..0558a543 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -2291,7 +2291,7 @@ if ( error == "parsererror" ) { log( oSettings, 0, 'Invalid JSON response', 1 ); } - else if ( xhr.readyState === 4 ) { + else { log( oSettings, 0, 'Ajax error', 7 ); }