mirror of
https://github.com/DataTables/DataTables.git
synced 2024-11-29 11:24:10 +01:00
Fix DataTables/DataTables #288 - Column search wasn't being used
This commit is contained in:
parent
0dab1e20de
commit
ecceb7a2ca
@ -1 +1 @@
|
||||
d9f16a4ed28aafc6c68a1fa4174e5e7ebf4d7181
|
||||
5163edd378fd86020a43a1b5a21ed8732bd92990
|
||||
|
@ -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 !== '' ) {
|
||||
|
2
media/js/jquery.dataTables.js
vendored
2
media/js/jquery.dataTables.js
vendored
@ -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 );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user