revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-03-30 22:18:13 +02:00
Code Issues Releases Wiki Activity

Storage - fix more query errors by escaping collate_text and collate_sort

Browse source 
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
This commit is contained in:
Bob Trahan 2014-10-06 15:51:42 -07:00
parent 31817b9097
commit 0bbe3a6d28
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/infrastructure/storage/management/PhabricatorStorageManagementAPI.php
View file

@ -192,8 +192,10 @@ final class PhabricatorStorageManagementAPI {
foreach ($queries as $query) { foreach ($queries as $query) {
$query = str_replace('{$NAMESPACE}', $this->namespace, $query); $query = str_replace('{$NAMESPACE}', $this->namespace, $query);
$query = str_replace('{$CHARSET}', $charset, $query); $query = str_replace('{$CHARSET}', $charset, $query);
$query = str_replace('{$COLLATE_TEXT}', $collate_text, $query); $escaped_text = qsprintf($conn, '%T', $collate_text);
$query = str_replace('{$COLLATE_SORT}', $collate_sort, $query); $query = str_replace('{$COLLATE_TEXT}', $escaped_text, $query);
$escaped_text = qsprintf($conn, '%T', $collate_sort);
$query = str_replace('{$COLLATE_SORT}', $escaped_text, $query);
queryfx( queryfx(
$conn, $conn,
'%Q', '%Q',