From 40547030a54e3dd33d5338266d4851cd982c2270 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 29 Jan 2013 11:01:47 -0800 Subject: [PATCH] render_tag -> tag: PropertyListView Summary: Converts callsites in PropertyListView (addDetail() and setTextContent()). Test Plan: Grepped for PhabricatorPropertyListView, addDetail() and setTextContent(). Reviewers: vrana Reviewed By: vrana CC: aran Maniphest Tasks: T2432 Differential Revision: https://secure.phabricator.com/D4695 --- .../base/controller/PhabricatorController.php | 3 +- .../PhabricatorConfigAllController.php | 11 ++++--- .../PhabricatorWorkerTaskDetailController.php | 16 +++++----- ...fferentialApplyPatchFieldSpecification.php | 2 +- ...ntialArcanistProjectFieldSpecification.php | 2 +- .../DifferentialBranchFieldSpecification.php | 2 +- .../DifferentialCommitsFieldSpecification.php | 2 +- ...erentialDependenciesFieldSpecification.php | 2 +- ...ifferentialDependsOnFieldSpecification.php | 2 +- ...ferentialExportPatchFieldSpecification.php | 5 +++- .../DifferentialFieldSpecification.php | 4 +-- .../DifferentialHostFieldSpecification.php | 2 +- .../DifferentialLinesFieldSpecification.php | 2 +- ...entialManiphestTasksFieldSpecification.php | 2 +- .../DifferentialPathFieldSpecification.php | 2 +- ...fferentialRevertPlanFieldSpecification.php | 2 +- .../view/DifferentialResultsTableView.php | 4 +-- .../view/DifferentialRevisionDetailView.php | 4 +-- .../DiffusionBrowseFileController.php | 14 ++++----- .../controller/DiffusionCommitController.php | 18 +++++++----- .../controller/DrydockLeaseViewController.php | 8 ++--- .../DrydockResourceViewController.php | 7 ++--- .../PhabricatorFileInfoController.php | 10 +++---- .../PhabricatorMacroViewController.php | 4 +-- .../ManiphestTaskDetailController.php | 9 +++--- .../blog/PhameBlogViewController.php | 13 +++++---- .../post/PhamePostViewController.php | 9 ++++-- .../controller/PholioMockViewController.php | 2 +- .../PonderQuestionViewController.php | 7 ++--- .../PhabricatorPropertyListExample.php | 7 +++-- .../layout/PhabricatorPropertyListView.php | 29 +++++++------------ 31 files changed, 102 insertions(+), 104 deletions(-) diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index 495291d59f..6e79333711 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -276,7 +276,8 @@ abstract class PhabricatorController extends AphrontController { foreach ($phids as $phid) { $items[] = $this->getHandle($phid)->renderLink(); } - return implode($style_map[$style], $items); + + return phutil_safe_html(implode($style_map[$style], $items)); } protected function buildApplicationMenu() { diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index e7b46c7c3c..60f95b2263 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -68,13 +68,16 @@ final class PhabricatorConfigAllController $display_version = pht('Unknown'); } $version_property_list = id(new PhabricatorPropertyListView()); - $version_property_list->addProperty('Version', - phutil_escape_html($display_version)); + $version_property_list->addProperty( + pht('Version'), + $display_version); + $version_path = $phabricator_root.'/conf/local/VERSION'; if (Filesystem::pathExists($version_path)) { $version_from_file = Filesystem::readFile($version_path); - $version_property_list->addProperty('Local Version', - phutil_escape_html($version_from_file)); + $version_property_list->addProperty( + pht('Local Version'), + $version_from_file); } $nav = $this->buildSideNavView(); diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php index 7c28657fcd..75f391c5a2 100644 --- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php +++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php @@ -124,7 +124,7 @@ final class PhabricatorWorkerTaskDetailController $view->addProperty( pht('Task Class'), - phutil_escape_html($task->getTaskClass())); + $task->getTaskClass()); if ($task->getLeaseExpires()) { if ($task->getLeaseExpires() > time()) { @@ -133,7 +133,7 @@ final class PhabricatorWorkerTaskDetailController $lease_status = pht('Lease Expired'); } } else { - $lease_status = ''.pht('Not Leased').''; + $lease_status = phutil_tag('em', array(), pht('Not Leased')); } $view->addProperty( @@ -143,14 +143,14 @@ final class PhabricatorWorkerTaskDetailController $view->addProperty( pht('Lease Owner'), $task->getLeaseOwner() - ? phutil_escape_html($task->getLeaseOwner()) - : ''.pht('None').''); + ? $task->getLeaseOwner() + : phutil_tag('em', array(), pht('None'))); if ($task->getLeaseExpires() && $task->getLeaseOwner()) { $expires = ($task->getLeaseExpires() - time()); $expires = phabricator_format_relative_time_detailed($expires); } else { - $expires = ''.pht('None').''; + $expires = phutil_tag('em', array(), pht('None')); } $view->addProperty( @@ -159,12 +159,12 @@ final class PhabricatorWorkerTaskDetailController $view->addProperty( pht('Failure Count'), - phutil_escape_html($task->getFailureCount())); + $task->getFailureCount()); if ($task->isArchived()) { - $duration = phutil_escape_html(number_format($task->getDuration()).' us'); + $duration = number_format($task->getDuration()).' us'; } else { - $duration = ''.pht('Not Completed').''; + $duration = phutil_tag('em', array(), pht('Not Completed')); } $view->addProperty( diff --git a/src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php index 3a8c0efd6f..193162cf48 100644 --- a/src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php @@ -13,7 +13,7 @@ final class DifferentialApplyPatchFieldSpecification public function renderValueForRevisionView() { $revision = $this->getRevision(); - return 'arc patch D'.$revision->getID().''; + return phutil_tag('tt', array(), 'arc patch D'.$revision->getID()); } } diff --git a/src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php b/src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php index c64839eb9b..085c8b7824 100644 --- a/src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php @@ -27,7 +27,7 @@ final class DifferentialArcanistProjectFieldSpecification } $handle = $this->getHandle($arcanist_phid); - return phutil_escape_html($handle->getName()); + return $handle->getName(); } private function getArcanistProjectPHID() { diff --git a/src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php index 2119d5699e..86b1399df8 100644 --- a/src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php @@ -26,7 +26,7 @@ final class DifferentialBranchFieldSpecification return null; } - return phutil_escape_html($branch); + return $branch; } public function renderValueForMail($phase) { diff --git a/src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php b/src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php index 671e3d5f9f..ae8339c05c 100644 --- a/src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php @@ -26,7 +26,7 @@ final class DifferentialCommitsFieldSpecification $links[] = $this->getHandle($commit_phid)->renderLink(); } - return implode('
', $links); + return array_interleave(phutil_tag('br'), $links); } private function getCommitPHIDs() { diff --git a/src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php index 6d03fe7ecb..43f387bb57 100644 --- a/src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php @@ -26,7 +26,7 @@ final class DifferentialDependenciesFieldSpecification $links[] = $this->getHandle($revision_phids)->renderLink(); } - return implode('
', $links); + return array_interleave(phutil_tag('br'), $links); } private function getDependentRevisionPHIDs() { diff --git a/src/applications/differential/field/specification/DifferentialDependsOnFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDependsOnFieldSpecification.php index 24096ccabd..09da33abc2 100644 --- a/src/applications/differential/field/specification/DifferentialDependsOnFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialDependsOnFieldSpecification.php @@ -26,7 +26,7 @@ final class DifferentialDependsOnFieldSpecification $links[] = $this->getHandle($revision_phids)->renderLink(); } - return implode('
', $links); + return phutil_safe_html(implode('
', $links)); } private function getDependentRevisionPHIDs() { diff --git a/src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php index 00c16b4547..313279bcb2 100644 --- a/src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php @@ -13,7 +13,10 @@ final class DifferentialExportPatchFieldSpecification public function renderValueForRevisionView() { $revision = $this->getRevision(); - return 'arc export --revision '.$revision->getID().''; + return phutil_tag( + 'tt', + array(), + 'arc export --revision '.$revision->getID()); } } diff --git a/src/applications/differential/field/specification/DifferentialFieldSpecification.php b/src/applications/differential/field/specification/DifferentialFieldSpecification.php index 2f78967d7d..9453668fae 100644 --- a/src/applications/differential/field/specification/DifferentialFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialFieldSpecification.php @@ -274,7 +274,7 @@ abstract class DifferentialFieldSpecification { */ public function renderUserList(array $user_phids) { if (!$user_phids) { - return 'None'; + return phutil_tag('em', array(), pht('None')); } $links = array(); @@ -283,7 +283,7 @@ abstract class DifferentialFieldSpecification { $links[] = $handle->renderLink(); } - return implode(', ', $links); + return phutil_safe_html(implode(', ', $links)); } diff --git a/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php b/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php index 1f9ed6b700..b1f1a9c099 100644 --- a/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php @@ -17,7 +17,7 @@ final class DifferentialHostFieldSpecification if (!$host) { return null; } - return phutil_escape_html($host); + return $host; } } diff --git a/src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php b/src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php index 01ac9ec1f7..31a7b7bac3 100644 --- a/src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php @@ -13,7 +13,7 @@ final class DifferentialLinesFieldSpecification public function renderValueForRevisionView() { $diff = $this->getDiff(); - return phutil_escape_html(number_format($diff->getLineCount())); + return number_format($diff->getLineCount()); } public function shouldAppearOnRevisionList() { diff --git a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php index d628897632..44890675bd 100644 --- a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php @@ -29,7 +29,7 @@ final class DifferentialManiphestTasksFieldSpecification $links[] = $this->getHandle($task_phid)->renderLink(); } - return implode('
', $links); + return phutil_safe_html(implode('
', $links)); } private function getManiphestTaskPHIDs() { diff --git a/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php b/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php index 7a85823833..376d080add 100644 --- a/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php @@ -19,7 +19,7 @@ final class DifferentialPathFieldSpecification return null; } - return phutil_escape_html($path); + return $path; } } diff --git a/src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php b/src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php index f23b39c875..c3560c08a3 100644 --- a/src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php @@ -47,7 +47,7 @@ final class DifferentialRevertPlanFieldSpecification if (!$this->value) { return null; } - return phutil_escape_html($this->value); + return $this->value; } public function shouldAppearOnConduitView() { diff --git a/src/applications/differential/view/DifferentialResultsTableView.php b/src/applications/differential/view/DifferentialResultsTableView.php index 519c9319f1..f2be210728 100644 --- a/src/applications/differential/view/DifferentialResultsTableView.php +++ b/src/applications/differential/view/DifferentialResultsTableView.php @@ -102,13 +102,13 @@ final class DifferentialResultsTableView extends AphrontView { require_celerity_resource('differential-results-table-css'); - return javelin_render_tag( + return javelin_tag( 'table', array( 'class' => 'differential-results-table', 'sigil' => 'differential-results-table', ), - implode("\n", $rows)); + $rows); } diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php index 8e366f560c..1182012952 100644 --- a/src/applications/differential/view/DifferentialRevisionDetailView.php +++ b/src/applications/differential/view/DifferentialRevisionDetailView.php @@ -66,10 +66,10 @@ final class DifferentialRevisionDetailView extends AphrontView { switch ($local_vcs) { case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $next_step = 'arc land'; + $next_step = phutil_tag('tt', array(), 'arc land'); break; case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $next_step = 'arc commit'; + $next_step = phutil_tag('tt', array(), 'arc commit'); break; } } diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index 624dbdb9ac..534ddd7e8c 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -805,17 +805,17 @@ final class DiffusionBrowseFileController extends DiffusionController { $size = strlen($data); $properties->addTextContent( pht('This is a binary file. It is %2$s byte(s) in length.', - $size, - PhutilTranslator::getInstance()->formatNumber($size)) - ); + $size, + PhutilTranslator::getInstance()->formatNumber($size))); $actions = id(new PhabricatorActionListView()) ->setUser($this->getRequest()->getUser()) ->addAction($this->createEditAction()) - ->addAction(id(new PhabricatorActionView()) - ->setName(pht('Download Binary File...')) - ->setIcon('download') - ->setHref($file_uri)); + ->addAction( + id(new PhabricatorActionView()) + ->setName(pht('Download Binary File...')) + ->setIcon('download') + ->setHref($file_uri)); return array($actions, $properties); diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index 235be74c25..7181c0b5da 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -92,11 +92,13 @@ final class DiffusionCommitController extends DiffusionController { } $property_list->addTextContent( - '
'. + phutil_tag( + 'div', + array( + 'class' => 'diffusion-commit-message phabricator-remarkup', + ), phutil_safe_html( - $engine->markupText($commit_data->getCommitMessage())). - '
' - ); + $engine->markupText($commit_data->getCommitMessage())))); $content[] = $top_anchor; $content[] = $headsup_view; @@ -412,7 +414,7 @@ final class DiffusionCommitController extends DiffusionController { if ($data->getCommitDetail('authorPHID')) { $props['Author'] = $handles[$author_phid]->renderLink(); } else { - $props['Author'] = phutil_escape_html($data->getAuthorName()); + $props['Author'] = $data->getAuthorName(); } $reviewer_phid = $data->getCommitDetail('reviewerPHID'); @@ -426,7 +428,7 @@ final class DiffusionCommitController extends DiffusionController { if ($data->getCommitDetail('committerPHID')) { $props['Committer'] = $handles[$committer_phid]->renderLink(); } else { - $props['Committer'] = phutil_escape_html($committer); + $props['Committer'] = $committer; } } @@ -467,7 +469,7 @@ final class DiffusionCommitController extends DiffusionController { foreach ($task_phids as $phid) { $task_list[] = $handles[$phid]->renderLink(); } - $task_list = implode('
', $task_list); + $task_list = array_interleave(phutil_tag('br'), $task_list); $props['Tasks'] = $task_list; } @@ -476,7 +478,7 @@ final class DiffusionCommitController extends DiffusionController { foreach ($proj_phids as $phid) { $proj_list[] = $handles[$phid]->renderLink(); } - $proj_list = implode('
', $proj_list); + $proj_list = array_interleave(phutil_tag('br'), $proj_list); $props['Projects'] = $proj_list; } diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php index 21ab432f91..ac634b9ccc 100644 --- a/src/applications/drydock/controller/DrydockLeaseViewController.php +++ b/src/applications/drydock/controller/DrydockLeaseViewController.php @@ -109,19 +109,17 @@ final class DrydockLeaseViewController extends DrydockController { $view->addProperty( pht('Resource Type'), - phutil_escape_html($lease->getResourceType())); + $lease->getResourceType()); $view->addProperty( pht('Resource'), - phutil_escape_html($lease->getResourceID())); + $lease->getResourceID()); $attributes = $lease->getAttributes(); if ($attributes) { $view->addSectionHeader(pht('Attributes')); foreach ($attributes as $key => $value) { - $view->addProperty( - phutil_escape_html($key), - phutil_escape_html($value)); + $view->addProperty($key, $value); } } diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php index 47ffb98d4f..33dcf38514 100644 --- a/src/applications/drydock/controller/DrydockResourceViewController.php +++ b/src/applications/drydock/controller/DrydockResourceViewController.php @@ -97,7 +97,6 @@ final class DrydockResourceViewController extends DrydockController { $status = $resource->getStatus(); $status = DrydockResourceStatus::getNameForStatus($status); - $status = phutil_escape_html($status); $view->addProperty( pht('Status'), @@ -105,15 +104,13 @@ final class DrydockResourceViewController extends DrydockController { $view->addProperty( pht('Resource Type'), - phutil_escape_html($resource->getType())); + $resource->getType()); $attributes = $resource->getAttributes(); if ($attributes) { $view->addSectionHeader(pht('Attributes')); foreach ($attributes as $key => $value) { - $view->addProperty( - phutil_escape_html($key), - phutil_escape_html($value)); + $view->addProperty($key, $value); } } diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php index 9b1f1c0619..faeac9c154 100644 --- a/src/applications/files/controller/PhabricatorFileInfoController.php +++ b/src/applications/files/controller/PhabricatorFileInfoController.php @@ -112,19 +112,19 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { $view->addProperty( pht('Mime Type'), - phutil_escape_html($file->getMimeType())); + $file->getMimeType()); $view->addProperty( pht('Engine'), - phutil_escape_html($file->getStorageEngine())); + $file->getStorageEngine()); $view->addProperty( pht('Format'), - phutil_escape_html($file->getStorageFormat())); + $file->getStorageFormat()); $view->addProperty( pht('Handle'), - phutil_escape_html($file->getStorageHandle())); + $file->getStorageHandle()); $metadata = $file->getMetadata(); if (!empty($metadata)) { @@ -133,7 +133,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { foreach ($metadata as $key => $value) { $view->addProperty( PhabricatorFile::getMetadataName($key), - phutil_escape_html($value)); + $value); } } diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php index b2b7d1e98a..770ae16a1c 100644 --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -147,9 +147,9 @@ final class PhabricatorMacroViewController foreach ($subscribers as $subscriber) { $sub_view[] = $this->getHandle($subscriber)->renderLink(); } - $sub_view = implode(', ', $sub_view); + $sub_view = array_interleave(', ', $sub_view); } else { - $sub_view = ''.pht('None').''; + $sub_view = phutil_tag('em', array(), pht('None')); } $view->addProperty( diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index cf1059d99e..b4567f0ddf 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -435,18 +435,17 @@ final class ManiphestTaskDetailController extends ManiphestController { pht('Assigned To'), $task->getOwnerPHID() ? $this->getHandle($task->getOwnerPHID())->renderLink() - : ''.pht('None').''); + : phutil_tag('em', array(), pht('None'))); $view->addProperty( pht('Priority'), - phutil_escape_html( - ManiphestTaskPriority::getTaskPriorityName($task->getPriority()))); + ManiphestTaskPriority::getTaskPriorityName($task->getPriority())); $view->addProperty( pht('Subscribers'), $task->getCCPHIDs() ? $this->renderHandlesForPHIDs($task->getCCPHIDs(), ',') - : ''.pht('None').''); + : phutil_tag('em', array(), pht('None'))); $view->addProperty( pht('Author'), @@ -469,7 +468,7 @@ final class ManiphestTaskDetailController extends ManiphestController { pht('Projects'), $task->getProjectPHIDs() ? $this->renderHandlesForPHIDs($task->getProjectPHIDs(), ',') - : ''.pht('None').''); + : phutil_tag('em', array(), pht('None'))); foreach ($aux_fields as $aux_field) { $aux_key = $aux_field->getAuxiliaryKey(); diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php index 15fc82ad2a..00214cf100 100644 --- a/src/applications/phame/controller/blog/PhameBlogViewController.php +++ b/src/applications/phame/controller/blog/PhameBlogViewController.php @@ -69,11 +69,11 @@ final class PhameBlogViewController extends PhameController { $properties->addProperty( pht('Skin'), - phutil_escape_html($blog->getSkin())); + $blog->getSkin()); $properties->addProperty( pht('Domain'), - phutil_escape_html($blog->getDomain())); + $blog->getDomain()); $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions( $user, @@ -97,9 +97,12 @@ final class PhameBlogViewController extends PhameController { ->process(); $properties->addTextContent( - '
'. - $engine->getOutput($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION). - '
'); + phutil_tag( + 'div', + array( + 'class' => 'phabricator-remarkup', + ), + $engine->getOutput($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION))); return $properties; } diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php index 967316014c..d29b582a05 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -184,9 +184,12 @@ final class PhamePostViewController extends PhameController { ->process(); $properties->addTextContent( - '
'. - $engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY). - '
'); + phutil_tag( + 'div', + array( + 'class' => 'phabricator-remarkup', + ), + $engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY))); return $properties; } diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php index 0bf0022fe1..a03452a6d4 100644 --- a/src/applications/pholio/controller/PholioMockViewController.php +++ b/src/applications/pholio/controller/PholioMockViewController.php @@ -148,7 +148,7 @@ final class PholioMockViewController extends PholioController { } $sub_view = implode(', ', $sub_view); } else { - $sub_view = ''.pht('None').''; + $sub_view = phutil_tag('em', array(), pht('None')); } $properties->addProperty( diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php index 4a34a328f0..0526d30d7b 100644 --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -117,15 +117,12 @@ final class PonderQuestionViewController extends PonderController { phabricator_datetime($question->getDateCreated(), $viewer)); if ($subscribers) { - foreach ($subscribers as $key => $subscriber) { - $subscribers[$key] = $this->getHandle($subscriber)->renderLink(); - } - $subscribers = implode(', ', $subscribers); + $subscribers = $this->renderHandlesForPHIDs($subscribers); } $view->addProperty( pht('Subscribers'), - nonempty($subscribers, ''.pht('None').'')); + nonempty($subscribers, phutil_tag('em', array(), pht('None')))); return $view; } diff --git a/src/applications/uiexample/examples/PhabricatorPropertyListExample.php b/src/applications/uiexample/examples/PhabricatorPropertyListExample.php index 68e1449aa6..0e0e6dc2ec 100644 --- a/src/applications/uiexample/examples/PhabricatorPropertyListExample.php +++ b/src/applications/uiexample/examples/PhabricatorPropertyListExample.php @@ -49,9 +49,10 @@ final class PhabricatorPropertyListExample extends PhabricatorUIExample { $view->addSectionHeader('Haiku About Pasta'); $view->addTextContent( - 'this is a pasta
'. - 'haiku. it is very bad.
'. - 'what did you expect?'); + phutil_safe_html( + 'this is a pasta
'. + 'haiku. it is very bad.
'. + 'what did you expect?')); $edge_cases_header = id(new PhabricatorHeaderView()) ->setHeader(pht('Edge Cases')); diff --git a/src/view/layout/PhabricatorPropertyListView.php b/src/view/layout/PhabricatorPropertyListView.php index d89ee97fb4..85c1c2774b 100644 --- a/src/view/layout/PhabricatorPropertyListView.php +++ b/src/view/layout/PhabricatorPropertyListView.php @@ -93,30 +93,21 @@ final class PhabricatorPropertyListView extends AphrontView { 'class' => 'phabricator-property-list-key', ), $key); - $items[] = phutil_render_tag( + + $items[] = phutil_tag( 'dd', array( 'class' => 'phabricator-property-list-value', ), - $this->renderSingleView($value)); + $this->renderHTMLView($value)); } - $list = phutil_render_tag( + $list = phutil_tag( 'dl', array( 'class' => 'phabricator-property-list-properties', ), - $this->renderSingleView($items)); - - $content = $this->renderChildren(); - if (strlen($content)) { - $content = phutil_render_tag( - 'div', - array( - 'class' => 'phabricator-property-list-content', - ), - $content); - } + $this->renderHTMLView($items)); $shortcuts = null; if ($this->hasKeyboardShortcuts) { @@ -124,9 +115,9 @@ final class PhabricatorPropertyListView extends AphrontView { id(new AphrontKeyboardShortcutsAvailableView())->render(); } - return - $shortcuts. - phutil_render_tag( + return array( + $shortcuts, + phutil_tag( 'div', array( 'class' => 'phabricator-property-list-container', @@ -137,7 +128,7 @@ final class PhabricatorPropertyListView extends AphrontView { 'div', array('class' => 'phabriator-property-list-view-end'), ''), - )); + ))); } private function renderSectionPart(array $part) { @@ -150,7 +141,7 @@ final class PhabricatorPropertyListView extends AphrontView { } private function renderTextPart(array $part) { - return phutil_render_tag( + return phutil_tag( 'div', array( 'class' => 'phabricator-property-list-text-content',