From d980adfe3f57c9327d3758663b4877bf7e6ccc1f Mon Sep 17 00:00:00 2001
From: Nick Harper <nharper@fb.com>
Date: Fri, 25 Jan 2013 15:22:36 -0800
Subject: [PATCH] Don't do string concatenation in queryfx_all()

Summary: Searching for image macros was broken, and this fixes it.

Test Plan: load /macro/?name=test - the page loads instead of throwing an exception

Reviewers: vrana, epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4658
---
 .../macro/controller/PhabricatorMacroListController.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/macro/controller/PhabricatorMacroListController.php b/src/applications/macro/controller/PhabricatorMacroListController.php
index 3756d346a0..db7a1fc591 100644
--- a/src/applications/macro/controller/PhabricatorMacroListController.php
+++ b/src/applications/macro/controller/PhabricatorMacroListController.php
@@ -36,9 +36,9 @@ final class PhabricatorMacroListController
     if ($has_search) {
       $macros = queryfx_all(
         $conn,
-        'SELECT m.*
-          FROM '.implode(' JOIN ', $join).'
-          WHERE '.implode(' AND ', $where));
+        'SELECT m.* FROM  %Q WHERE %Q',
+        implode(' JOIN ', $join),
+        implode(' AND ', $where));
       $macros = $macro_table->loadAllFromArray($macros);
       $nodata = pht('There are no macros matching the filter.');
     } else {