revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-22 21:40:55 +01:00
Code Issues Releases Wiki Activity

Don't do string concatenation in queryfx_all()

Browse source 
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
This commit is contained in:
Nick Harper 2013-01-25 15:22:36 -08:00
parent 48c5356111
commit d980adfe3f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/macro/controller/PhabricatorMacroListController.php
View file

@ -36,9 +36,9 @@ final class PhabricatorMacroListController
if ($has_search) { if ($has_search) {
$macros = queryfx_all( $macros = queryfx_all(
$conn, $conn,
'SELECT m.* 'SELECT m.* FROM %Q WHERE %Q',
FROM '.implode(' JOIN ', $join).' implode(' JOIN ', $join),
WHERE '.implode(' AND ', $where)); implode(' AND ', $where));
$macros = $macro_table->loadAllFromArray($macros); $macros = $macro_table->loadAllFromArray($macros);
$nodata = pht('There are no macros matching the filter.'); $nodata = pht('There are no macros matching the filter.');
} else { } else {