@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Storage - fix more query errors by escaping collate_text and collate_sort
Summary: second bit of https://github.com/phacility/phabricator/pull/729
Test Plan: this is a weird pull request merge
Reviewers: chad, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Differential Revision: https://secure.phabricator.com/D10646
+4
-2
+4
-2
src/infrastructure/storage/management/PhabricatorStorageManagementAPI.php
+4
-2
src/infrastructure/storage/management/PhabricatorStorageManagementAPI.php
···
192
192
foreach ($queries as $query) {
193
193
$query = str_replace('{$NAMESPACE}', $this->namespace, $query);
194
194
$query = str_replace('{$CHARSET}', $charset, $query);
195
-
$query = str_replace('{$COLLATE_TEXT}', $collate_text, $query);
196
-
$query = str_replace('{$COLLATE_SORT}', $collate_sort, $query);
195
+
$escaped_text = qsprintf($conn, '%T', $collate_text);
196
+
$query = str_replace('{$COLLATE_TEXT}', $escaped_text, $query);
197
+
$escaped_text = qsprintf($conn, '%T', $collate_sort);
198
+
$query = str_replace('{$COLLATE_SORT}', $escaped_text, $query);
197
199
queryfx(
198
200
$conn,
199
201
'%Q',