Merge pull request #631 from leigh-ols/leigh-ols-patch-2

avbdr · web-flow · commit 52b8db40f370 · 2017-06-06T13:13:30.000-04:00
Fix issue where orderBy strips spaces from fieldname
diff --git a/MysqliDb.php b/MysqliDb.php
@@ -1093,7 +1093,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields
     {
         $allowedDirection = Array("ASC", "DESC");
         $orderbyDirection = strtoupper(trim($orderbyDirection));
-        $orderByField = preg_replace("/[^-a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
+        $orderByField = preg_replace("/[^ -a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
 
         // Add table prefix to orderByField if needed.
         //FIXME: We are adding prefix only if table is enclosed into `` to distinguish aliases

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields`
`1093`	`1093`	`{`
`1094`	`1094`	`$allowedDirection = Array("ASC", "DESC");`
`1095`	`1095`	`$orderbyDirection = strtoupper(trim($orderbyDirection));`
`1096`		- $orderByField = preg_replace("/[^-a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
	`1096`	+ $orderByField = preg_replace("/[^ -a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
`1097`	`1097`
`1098`	`1098`	`// Add table prefix to orderByField if needed.`
`1099`	`1099`	//FIXME: We are adding prefix only if table is enclosed into `` to distinguish aliases