1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-30 10:42:41 +01:00

Fix double escaping in phutil_tag

Summary:
I wasn't able to reproduce the "recursion detected" in real web request but I saw lots of 1073741824 refcounts in `debug_zval_dump()` of $object.
I'm not sure how that happens.

Test Plan: D4807#4

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2432

Differential Revision: https://secure.phabricator.com/D4839
This commit is contained in:
vrana 2013-02-06 14:49:34 -08:00
parent 2f508bf0dc
commit f864d9e611
4 changed files with 6 additions and 7 deletions

View file

@ -143,8 +143,9 @@ final class PhabricatorDirectoryMainController
if (!$tasks) { if (!$tasks) {
return $this->renderMiniPanel( return $this->renderMiniPanel(
'No "Needs Triage" Tasks', 'No "Needs Triage" Tasks',
hsprintf(
'No tasks in <a href="/project/">projects you are a member of</a> '. 'No tasks in <a href="/project/">projects you are a member of</a> '.
'need triage.'); 'need triage.'));
} }
$panel = new AphrontPanelView(); $panel = new AphrontPanelView();

View file

@ -96,6 +96,6 @@ abstract class PhabricatorRepositoryCommitParserWorker
->load($commit->getRepositoryID()); ->load($commit->getRepositoryID());
$link = DiffusionView::linkCommit($repository, $link = DiffusionView::linkCommit($repository,
$commit->getCommitIdentifier()); $commit->getCommitIdentifier());
return $link.$suffix; return hsprintf('%s%s', $link, $suffix);
} }
} }

View file

@ -151,9 +151,7 @@ abstract class PhabricatorWorker {
public function renderForDisplay() { public function renderForDisplay() {
$data = PhutilReadableSerializer::printableValue($this->data); $data = PhutilReadableSerializer::printableValue($this->data);
$data = phutil_escape_html($data); return phutil_tag('pre', array(), $data);
$data = '<pre>'.$data.'</pre>';
return $data;
} }
} }

View file

@ -84,7 +84,7 @@ final class AphrontTokenizerTemplateView extends AphrontView {
'type' => 'hidden', 'type' => 'hidden',
'name' => $input_name, 'name' => $input_name,
'value' => $key, 'value' => $key,
)). )),
phutil_tag('span', array('class' => 'jx-tokenizer-x-placeholder'), ''), phutil_tag('span', array('class' => 'jx-tokenizer-x-placeholder'), ''),
)); ));
} }