From e785dfd499cf1c1cb7890ca6db40ecb8fa2a88b6 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 25 Jul 2014 01:38:17 +0000
Subject: [PATCH] Change the logic a little more for the smooth fall back

---
 resources/classes/domains.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 4832ae70e3..f98a2a204c 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -50,8 +50,7 @@
 				$sql = "select * from v_default_settings ";
 				$sql .= "where default_setting_enabled = 'true' ";
 				try {
-					$sql .= "order by default_setting_order asc ";
-					$prep_statement = $db->prepare($sql);
+					$prep_statement = $db->prepare($sql . " order by default_setting_order asc ");
 					$prep_statement->execute();
 				}
 				catch(PDOException $e) {
@@ -86,8 +85,7 @@
 				$sql .= "where domain_uuid = '" . $_SESSION["domain_uuid"] . "' ";
 				$sql .= "and domain_setting_enabled = 'true' ";
 				try {
-					$sql .= "order by domain_setting_order asc ";
-					$prep_statement = $db->prepare($sql);
+					$prep_statement = $db->prepare($sql . " order by domain_setting_order asc ");
 					$prep_statement->execute();
 				}
 				catch(PDOException $e) {
@@ -125,8 +123,7 @@
 					$sql .= "and user_uuid = '" . $_SESSION["user_uuid"] . "' ";
 					$sql .= "and user_setting_enabled = 'true' ";
 					try {
-						$sql .= "order by user_setting_order asc ";
-						$prep_statement = $db->prepare($sql);
+						$prep_statement = $db->prepare($sql . " order by user_setting_order asc ");
 						$prep_statement->execute();
 					}
 					catch(PDOException $e) {