From 34e90d8f5139f3afac2230536933eb812dd428d1 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 2 Mar 2019 06:13:58 -0800 Subject: [PATCH] Clean up a few "%Q" stragglers in SVN repository browsing code Summary: See . Test Plan: Browed a Subversion repository in Diffusion. These are all reachable from the main landing page if the repository has commits/files, I think. Before change: errors in log; after change: no issues. Reviewers: amckinley Reviewed By: amckinley Differential Revision: https://secure.phabricator.com/D20244 --- .../conduit/DiffusionBrowseQueryConduitAPIMethod.php | 12 +++++++----- .../DiffusionHistoryQueryConduitAPIMethod.php | 12 ++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php index fe99471b0c..0b6ae19e32 100644 --- a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php @@ -368,9 +368,9 @@ final class DiffusionBrowseQueryConduitAPIMethod } if ($commit) { - $slice_clause = 'AND svnCommit <= '.(int)$commit; + $slice_clause = qsprintf($conn_r, 'AND svnCommit <= %d', $commit); } else { - $slice_clause = ''; + $slice_clause = qsprintf($conn_r, ''); } $index = queryfx_all( @@ -439,9 +439,11 @@ final class DiffusionBrowseQueryConduitAPIMethod $sql = array(); foreach ($index as $row) { - $sql[] = - '(pathID = '.(int)$row['pathID'].' AND '. - 'svnCommit = '.(int)$row['maxCommit'].')'; + $sql[] = qsprintf( + $conn_r, + '(pathID = %d AND svnCommit = %d)', + $row['pathID'], + $row['maxCommit']); } $browse = queryfx_all( diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php index 4c1d39e8c8..ebce21dd6f 100644 --- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php @@ -215,13 +215,17 @@ final class DiffusionHistoryQueryConduitAPIMethod return array(); } - $filter_query = ''; + $filter_query = qsprintf($conn_r, ''); if ($need_direct_changes) { if ($need_child_changes) { - $type = DifferentialChangeType::TYPE_CHILD; - $filter_query = 'AND (isDirect = 1 OR changeType = '.$type.')'; + $filter_query = qsprintf( + $conn_r, + 'AND (isDirect = 1 OR changeType = %s)', + DifferentialChangeType::TYPE_CHILD); } else { - $filter_query = 'AND (isDirect = 1)'; + $filter_query = qsprintf( + $conn_r, + 'AND (isDirect = 1)'); } }