rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00
Code Issues Releases Activity

Revert "Merge branch 'master' of github.com:DataTables/DataTablesSrc"

Browse Source 
This reverts commit d484e85534a1c8eb28542be5169d4c28690cae48, reversing
changes made to e84eb39f630d04259f7d5377084c2e3b1a4abe42.
This commit is contained in:
Allan Jardine 2017-08-31 14:45:06 +01:00
parent 98fe28aeb2
commit df9fdc0d4a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
d484e85534a1c8eb28542be5169d4c28690cae48 22fb869ab8d64f1ac264cf32509efb4ba832e7f1

7
examples/server_side/scripts/ssp.class.php
View File

@ -86,9 +86,10 @@ class SSP {
* Construct the LIMIT clause for server-side processing SQL query * Construct the LIMIT clause for server-side processing SQL query
* *
* @param array $request Data sent to server by DataTables * @param array $request Data sent to server by DataTables
* @param array $columns Column information array
* @return string SQL limit clause * @return string SQL limit clause
*/ */
static function limit ( $request ) static function limit ( $request, $columns )
{ {
$limit = ''; $limit = '';
@ -235,7 +236,7 @@ class SSP {
$db = self::db( $conn ); $db = self::db( $conn );
// Build the SQL query string from the request // Build the SQL query string from the request
$limit = self::limit( $request ); $limit = self::limit( $request, $columns );
$order = self::order( $request, $columns ); $order = self::order( $request, $columns );
$where = self::filter( $request, $columns, $bindings ); $where = self::filter( $request, $columns, $bindings );
@ -309,7 +310,7 @@ class SSP {
$whereAllSql = ''; $whereAllSql = '';
// Build the SQL query string from the request // Build the SQL query string from the request
$limit = self::limit( $request ); $limit = self::limit( $request, $columns );
$order = self::order( $request, $columns ); $order = self::order( $request, $columns );
$where = self::filter( $request, $columns, $bindings ); $where = self::filter( $request, $columns, $bindings );