From 6bd699b537db0837a2c671356c24a5c035161d07 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Wed, 9 Oct 2013 14:56:12 +0100
Subject: [PATCH] Dev fix: iDataSort and aDataSort conflicting on camelCase

- Simple fix is to check if it is a number or not
---
 .datatables-commit-sync       | 2 +-
 media/js/jquery.dataTables.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index b7843355..bbae0a78 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-4e31fb7585a9b338257edd8472de37255f924a0d
+41d498be3fc7e9d78db83ceb1b4715d6688030f8
diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index ba5e23b7..ff881655 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -296,7 +296,7 @@
 			/* iDataSort to be applied (backwards compatibility), but aDataSort will take
 			 * priority if defined
 			 */
-			if ( oOptions.iDataSort !== undefined )
+			if ( typeof oOptions.iDataSort === 'number' )
 			{
 				oCol.aDataSort = [ oOptions.iDataSort ];
 			}