From 81218f4fa3ad045d8384f8d48c32a793a36db769 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Thu, 14 Jun 2018 11:03:55 +0100
Subject: [PATCH] Fix - examples: PHP demo script could use invalid SQL if an
 orderable:false column was ordered upon

- Thread 45150
---
 .datatables-commit-sync                    | 2 +-
 examples/server_side/scripts/ssp.class.php | 4 +++-
 media/js/dataTables.bootstrap4.js          | 6 +++---
 media/js/dataTables.bootstrap4.min.js      | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index 82569044..c05ecacc 100644
--- 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
index 2c3fe0c4..e7f762ed 100644
--- a/examples/server_side/scripts/ssp.class.php
+++ b/examples/server_side/scripts/ssp.class.php
@@ -135,7 +135,9 @@ class SSP {
 				}
 			}
 
-			$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
index 29f9a784..7977fd79 100644
--- 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
index 02d80b7f..b689d7eb 100644
--- a/media/js/dataTables.bootstrap4.min.js
+++ b/media/js/dataTables.bootstrap4.min.js
@@ -1,6 +1,6 @@
 /*!
- DataTables Bootstrap 4 integration
- ©2011-2017 SpryMedia Ltd - datatables.net/license
+ DataTables Bootstrap 3 integration
+ ©2011-2015 SpryMedia Ltd - datatables.net/license
 */
 (function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,d){a||(a=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(a,d).$;return b(d,a,a.document)}:b(jQuery,window,document)})(function(b,a,d,m){var f=b.fn.dataTable;b.extend(!0,f.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
 renderer:"bootstrap"});b.extend(f.ext.classes,{sWrapper:"dataTables_wrapper container-fluid dt-bootstrap4",sFilterInput:"form-control form-control-sm",sLengthSelect:"form-control form-control-sm",sProcessing:"dataTables_processing card",sPageButton:"paginate_button page-item"});f.ext.renderer.pageButton.bootstrap=function(a,h,r,s,j,n){var o=new f.Api(a),t=a.oClasses,k=a.oLanguage.oPaginate,u=a.oLanguage.oAria.paginate||{},e,g,p=0,q=function(d,f){var l,h,i,c,m=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&