From e06cab919019b1612d61405864874593cf4bb435 Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Fri, 23 Dec 2016 14:44:04 +1100
Subject: [PATCH] Default to selected template if no token in queXS to
 determine template

---
 include/limesurvey/index.php | 7 ++++---
 include/limesurvey/quexs.php | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/limesurvey/index.php b/include/limesurvey/index.php
index 47be2be4..1365b185 100644
--- a/include/limesurvey/index.php
+++ b/include/limesurvey/index.php
@@ -505,8 +505,9 @@ else
 }
 
 
+$qtmp = quexs_get_template($clienttoken);
 
-if ($interviewer)
+if ($interviewer || $qtmp === false)
 {
 	//SET THE TEMPLATE DIRECTORY
 	if (!$thissurvey['templatedir'])
@@ -520,8 +521,8 @@ if ($interviewer)
 }
 else
 {
-	$thissurvey['templatedir'] = quexs_get_template($clienttoken);
-	$thistpl=sGetTemplatePath(quexs_get_template($clienttoken));
+	$thissurvey['templatedir'] = $qtmp;
+	$thistpl=sGetTemplatePath($qtmp);
 }
 
 
diff --git a/include/limesurvey/quexs.php b/include/limesurvey/quexs.php
index ca7ef8b9..a57a95c0 100644
--- a/include/limesurvey/quexs.php
+++ b/include/limesurvey/quexs.php
@@ -70,7 +70,7 @@ else
  */
 function quexs_get_template($clienttoken)
 {
-	if (empty($clienttoken)) return 'default';
+	if (empty($clienttoken)) return false;
 
 	$db = newADOConnection(DB_TYPE);
 	$db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -84,7 +84,7 @@ function quexs_get_template($clienttoken)
 	$tpl = $db->GetOne($sql);
 
 	if (empty($tpl)) 
-		return 'default';
+		return false;
 	else
 		return $tpl;
 }