Merge conflict resolved

symphonists · May 9, 2013 · 15aa48c · 15aa48c
2 parents 1e7ee07 + 5ff29a2
commit 15aa48c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/data-sources/datasource.union.php b/data-sources/datasource.union.php
@@ -686,7 +686,7 @@ public function fetchByPage($page = 1, $entriesPerPage) {
 			$sql = preg_replace('/^SELECT `e`.id/', 'SELECT SQL_CALC_FOUND_ROWS `e`.id', $sql, 1);
 
 			// Add the ORDER BY clause
-			$sql = $sql . ' ' . $this->data['sort'][0];
+			$sql = $sql . sprintf(' %s', trim($this->data['sort'][0]));
 
 			// Apply Pagination
 			if($this->dsParamPAGINATERESULTS == 'yes') {