Fix - examples: PHP demo script could use invalid SQL if an orderable…

…:false column was ordered upon - Thread 45150
DataTables · Jun 14, 2018 · 81218f4 · 81218f4
1 parent 713b749
commit 81218f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.datatables-commit-sync b/.datatables-commit-sync
@@ -1 +1 @@
-2b7c6705489fb30aefc5d25612e3860b781120b7
+0dd92d97b21e773487aafd20d800cb43a38ff5b4
diff --git a/examples/server_side/scripts/ssp.class.php b/examples/server_side/scripts/ssp.class.php
@@ -135,7 +135,9 @@ static function order ( $request, $columns )
 				}
 			}
 
-			$order = 'ORDER BY '.implode(', ', $orderBy);
+			if ( count( $orderBy ) ) {
+				$order = 'ORDER BY '.implode(', ', $orderBy);
+			}
 		}
 
 		return $order;

diff --git a/media/js/dataTables.bootstrap4.js b/media/js/dataTables.bootstrap4.js
@@ -1,9 +1,9 @@
-/*! DataTables Bootstrap 4 integration
- * ©2011-2017 SpryMedia Ltd - datatables.net/license
+/*! DataTables Bootstrap 3 integration
+ * ©2011-2015 SpryMedia Ltd - datatables.net/license
  */
 
 /**
- * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and
+ * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and
  * DataTables 1.10 or newer.
  *
  * This file sets the defaults and adds options to DataTables to style its

diff --git a/media/js/dataTables.bootstrap4.min.js b/media/js/dataTables.bootstrap4.min.js