From 20768d65d5660c7fdc8c14dc7245339915feada8 Mon Sep 17 00:00:00 2001 From: vrana Date: Thu, 17 Jan 2013 18:57:09 -0800 Subject: [PATCH] Convert phutil_render_tag(X, Y, '...') to phutil_tag Summary: Created with spatch: lang=diff - phutil_render_tag + phutil_tag (X, Y, '...') Then searched for `&` and `<` in the output and replaced them. Test Plan: Loaded homepage. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4503 --- .../console/plugin/DarkConsoleServicesPlugin.php | 2 +- .../console/plugin/DarkConsoleXHProfPlugin.php | 4 ++-- .../PhabricatorMustVerifyEmailController.php | 2 +- .../calendar/view/AphrontCalendarMonthView.php | 8 ++++---- .../PhabricatorCountdownListController.php | 2 +- .../PhabricatorDaemonConsoleController.php | 2 +- .../daemon/view/PhabricatorDaemonLogListView.php | 2 +- .../DifferentialDiffCreateController.php | 2 +- .../DifferentialRevisionViewController.php | 2 +- ...DifferentialChangesetFileTreeSideNavBuilder.php | 2 +- .../view/DifferentialDiffTableOfContentsView.php | 2 +- .../view/DifferentialInlineCommentEditView.php | 2 +- .../view/DifferentialInlineCommentView.php | 2 +- .../controller/DiffusionCommitTagsController.php | 2 +- .../diffusion/controller/DiffusionController.php | 2 +- .../controller/DiffusionHomeController.php | 2 +- .../controller/DiffusionRepositoryController.php | 6 +++--- .../diffusion/view/DiffusionBranchTableView.php | 2 +- .../diffusion/view/DiffusionBrowseTableView.php | 2 +- src/applications/diffusion/view/DiffusionView.php | 2 +- .../PhabricatorDirectoryMainController.php | 14 +++++++------- .../controller/PhabricatorFactChartController.php | 2 +- .../controller/PhabricatorFileUploadController.php | 2 +- .../flag/view/PhabricatorFlagListView.php | 6 +++--- .../herald/controller/HeraldHomeController.php | 2 +- .../controller/HeraldTranscriptListController.php | 2 +- .../herald/view/HeraldRuleListView.php | 2 +- .../PhabricatorMailingListsListController.php | 2 +- .../controller/ManiphestReportController.php | 10 +++++----- .../ManiphestSavedQueryListController.php | 4 ++-- .../controller/ManiphestTaskDetailController.php | 6 +++--- .../controller/ManiphestTaskListController.php | 4 ++-- .../meta/view/PhabricatorApplicationLaunchView.php | 2 +- .../PhabricatorMetaMTAListController.php | 2 +- .../PhabricatorMetaMTASendController.php | 4 ++-- .../PhabricatorNotificationPanelController.php | 2 +- .../PhabricatorOAuthClientEditController.php | 2 +- .../PhabricatorOAuthClientListController.php | 2 +- .../PhabricatorOAuthClientViewController.php | 2 +- ...catorOAuthClientAuthorizationEditController.php | 2 +- ...catorOAuthClientAuthorizationListController.php | 2 +- .../PhabricatorOwnersDetailController.php | 6 +++--- .../controller/PhabricatorPasteEditController.php | 2 +- .../application/PhabricatorApplicationPeople.php | 2 +- .../PhabricatorEmailVerificationController.php | 4 ++-- .../controller/PhabricatorPeopleEditController.php | 2 +- .../controller/PhabricatorPeopleLdapController.php | 6 +++--- .../controller/PhabricatorPeopleListController.php | 6 +++--- .../controller/post/PhamePostPublishController.php | 2 +- src/applications/phame/view/PhamePostView.php | 4 ++-- .../controller/PhrictionDiffController.php | 8 ++++---- .../controller/PhrictionDocumentController.php | 4 ++-- .../controller/PhrictionEditController.php | 4 ++-- .../controller/PhrictionHistoryController.php | 4 ++-- .../PhabricatorProjectMembersEditController.php | 2 +- .../PhabricatorProjectProfileController.php | 4 ++-- .../controller/PhabricatorRepositoryController.php | 2 +- .../PhabricatorRepositoryEditController.php | 2 +- .../PhabricatorRepositoryListController.php | 6 +++--- .../search/view/PhabricatorSearchResultView.php | 2 +- .../PhabricatorSettingsPanelDisplayPreferences.php | 2 +- .../PhabricatorSettingsPanelEmailAddresses.php | 2 +- .../panel/PhabricatorSettingsPanelSSHKeys.php | 2 +- ...habricatorApplicationTransactionCommentView.php | 2 +- .../view/PhabricatorXHProfProfileTopLevelView.php | 2 +- .../celerity/CelerityStaticResourceResponse.php | 2 +- .../diff/view/PhabricatorInlineSummaryView.php | 2 +- .../markup/rule/PhabricatorRemarkupRuleYoutube.php | 2 +- src/view/control/AphrontCursorPagerView.php | 6 +++--- src/view/control/AphrontTableView.php | 2 +- src/view/form/control/AphrontFormDateControl.php | 2 +- .../AphrontFormDragAndDropUploadControl.php | 2 +- src/view/form/control/AphrontFormImageControl.php | 2 +- .../form/control/PhabricatorRemarkupControl.php | 4 ++-- src/view/layout/AphrontSideNavFilterView.php | 4 ++-- src/view/layout/PhabricatorActionView.php | 2 +- src/view/layout/PhabricatorAnchorView.php | 2 +- src/view/layout/PhabricatorCrumbView.php | 4 ++-- src/view/layout/PhabricatorCrumbsView.php | 2 +- src/view/layout/PhabricatorObjectItemView.php | 6 +++--- src/view/layout/PhabricatorProfileHeaderView.php | 2 +- src/view/layout/PhabricatorTagView.php | 4 ++-- src/view/layout/PhabricatorTimelineEventView.php | 6 +++--- src/view/layout/PhabricatorTimelineView.php | 2 +- src/view/page/PhabricatorStandardPageView.php | 2 +- src/view/page/menu/PhabricatorMainMenuView.php | 10 +++++----- 86 files changed, 140 insertions(+), 140 deletions(-) diff --git a/src/aphront/console/plugin/DarkConsoleServicesPlugin.php b/src/aphront/console/plugin/DarkConsoleServicesPlugin.php index 757c1e7049..442ca9db4c 100644 --- a/src/aphront/console/plugin/DarkConsoleServicesPlugin.php +++ b/src/aphront/console/plugin/DarkConsoleServicesPlugin.php @@ -146,7 +146,7 @@ final class DarkConsoleServicesPlugin extends DarkConsolePlugin { $results[] = '
'. - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $this->getRequestURI()->alter('__analyze__', true), diff --git a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php index 299566e863..9368cb7e66 100644 --- a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php +++ b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php @@ -32,7 +32,7 @@ final class DarkConsoleXHProfPlugin extends DarkConsolePlugin { public function render() { if (!DarkConsoleXHProfPluginAPI::isProfilerAvailable()) { $href = PhabricatorEnv::getDoclink('article/Installation_Guide.html'); - $install_guide = phutil_render_tag( + $install_guide = phutil_tag( 'a', array( 'href' => $href, @@ -53,7 +53,7 @@ final class DarkConsoleXHProfPlugin extends DarkConsolePlugin { $header = '
'. - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $this->getRequestURI()->alter('__profile__', 'page'), diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php index 319163112d..58655c2e8b 100644 --- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php +++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php @@ -53,7 +53,7 @@ final class PhabricatorMustVerifyEmailController 'action' => '/login/mustverify/', 'method' => 'POST', ), - phutil_render_tag( + phutil_tag( 'button', array( ), diff --git a/src/applications/calendar/view/AphrontCalendarMonthView.php b/src/applications/calendar/view/AphrontCalendarMonthView.php index fa7d119d1f..5d175e7594 100644 --- a/src/applications/calendar/view/AphrontCalendarMonthView.php +++ b/src/applications/calendar/view/AphrontCalendarMonthView.php @@ -159,18 +159,18 @@ final class AphrontCalendarMonthView extends AphrontView { $uri = new PhutilURI($uri); list($prev_year, $prev_month) = $this->getPrevYearAndMonth(); $query = array('year' => $prev_year, 'month' => $prev_month); - $prev_link = phutil_render_tag( + $prev_link = phutil_tag( 'a', array('href' => (string) $uri->setQueryParams($query)), - '←' + "\xE2\x86\x90" ); list($next_year, $next_month) = $this->getNextYearAndMonth(); $query = array('year' => $next_year, 'month' => $next_month); - $next_link = phutil_render_tag( + $next_link = phutil_tag( 'a', array('href' => (string) $uri->setQueryParams($query)), - '→' + "\xE2\x86\x92" ); $left_th = ''.$prev_link.''; diff --git a/src/applications/countdown/controller/PhabricatorCountdownListController.php b/src/applications/countdown/controller/PhabricatorCountdownListController.php index 47cc610c6d..b015eb602f 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownListController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownListController.php @@ -28,7 +28,7 @@ final class PhabricatorCountdownListController $delete_button = null; if ($user->getIsAdmin() || ($user->getPHID() == $timer->getAuthorPHID())) { - $edit_button = phutil_render_tag( + $edit_button = phutil_tag( 'a', array( 'class' => 'small button grey', diff --git a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php index da5e439979..26059e4ce2 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php @@ -81,7 +81,7 @@ final class PhabricatorDaemonConsoleController $task->getLeaseOwner(), $task->getLeaseExpires() - time(), $task->getFailureCount(), - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/daemon/task/'.$task->getID().'/', diff --git a/src/applications/daemon/view/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/PhabricatorDaemonLogListView.php index c3f856d2ca..35f234733a 100644 --- a/src/applications/daemon/view/PhabricatorDaemonLogListView.php +++ b/src/applications/daemon/view/PhabricatorDaemonLogListView.php @@ -81,7 +81,7 @@ final class PhabricatorDaemonLogListView extends AphrontView { $log->getPID(), phabricator_date($epoch, $this->user), phabricator_time($epoch, $this->user), - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/daemon/log/'.$log->getID().'/', diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php index 76fc629dbd..054e69cb90 100644 --- a/src/applications/differential/controller/DifferentialDiffCreateController.php +++ b/src/applications/differential/controller/DifferentialDiffCreateController.php @@ -30,7 +30,7 @@ final class DifferentialDiffCreateController extends DifferentialController { $form = new AphrontFormView(); $arcanist_href = PhabricatorEnv::getDoclink( 'article/Arcanist_User_Guide.html'); - $arcanist_link = phutil_render_tag( + $arcanist_link = phutil_tag( 'a', array( 'href' => $arcanist_href, diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 9cbead02b4..7f6d6057c3 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -184,7 +184,7 @@ final class DifferentialRevisionViewController extends DifferentialController { '

'.pht('This diff is very large and affects %d files. Load '. 'each file individually. ', $count). "". - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $request_uri diff --git a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php index dfa474be67..1d5be8e265 100644 --- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php +++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php @@ -90,7 +90,7 @@ final class DifferentialChangesetFileTreeSideNavBuilder { $icon = 'phabricator-filetree-icon-dir'; } - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => 'phabricator-filetree-icon '.$icon, diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php index 6d622954aa..2c5d5058af 100644 --- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php +++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php @@ -182,7 +182,7 @@ final class DifferentialDiffTableOfContentsView extends AphrontView { $this->repository->getCallsign()); if ($editor_link) { $editor_link = - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $editor_link, diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php index e60b198a0f..86a2706ce6 100644 --- a/src/applications/differential/view/DifferentialInlineCommentEditView.php +++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php @@ -104,7 +104,7 @@ final class DifferentialInlineCommentEditView extends AphrontView { $buttons = implode('', $buttons); - $formatting = phutil_render_tag( + $formatting = phutil_tag( 'a', array( 'href' => PhabricatorEnv::getDoclink( diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php index 015f89e4f5..09ac5a906b 100644 --- a/src/applications/differential/view/DifferentialInlineCommentView.php +++ b/src/applications/differential/view/DifferentialInlineCommentView.php @@ -190,7 +190,7 @@ final class DifferentialInlineCommentView extends AphrontView { if ($this->preview) { $anchor = null; } else { - $anchor = phutil_render_tag( + $anchor = phutil_tag( 'a', array( 'name' => $anchor_name, diff --git a/src/applications/diffusion/controller/DiffusionCommitTagsController.php b/src/applications/diffusion/controller/DiffusionCommitTagsController.php index 5dbabff240..7bb6091296 100644 --- a/src/applications/diffusion/controller/DiffusionCommitTagsController.php +++ b/src/applications/diffusion/controller/DiffusionCommitTagsController.php @@ -32,7 +32,7 @@ final class DiffusionCommitTagsController extends DiffusionController { } if ($has_more_tags) { - $tag_links[] = phutil_render_tag( + $tag_links[] = phutil_tag( 'a', array( 'href' => $request->generateURI( diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php index ea11c4831b..14b734f43d 100644 --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -299,7 +299,7 @@ abstract class DiffusionController extends PhabricatorController { $last_crumb = array_pop($crumb_list); if ($raw_commit) { - $jump_link = phutil_render_tag( + $jump_link = phutil_tag( 'a', array( 'href' => $drequest->generateURI( diff --git a/src/applications/diffusion/controller/DiffusionHomeController.php b/src/applications/diffusion/controller/DiffusionHomeController.php index c951b764a8..d06f0d9863 100644 --- a/src/applications/diffusion/controller/DiffusionHomeController.php +++ b/src/applications/diffusion/controller/DiffusionHomeController.php @@ -146,7 +146,7 @@ final class DiffusionHomeController extends DiffusionController { } $repository_tool_uri = PhabricatorEnv::getProductionURI('/repository/'); - $repository_tool = phutil_render_tag('a', + $repository_tool = phutil_tag('a', array( 'href' => $repository_tool_uri, ), diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index 5af0a056ba..714b2819c1 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -60,7 +60,7 @@ final class DiffusionRepositoryController extends DiffusionController { $history_table->setIsHead(true); $callsign = $drequest->getRepository()->getCallsign(); - $all = phutil_render_tag( + $all = phutil_tag( 'a', array( 'href' => "/diffusion/{$callsign}/history/", @@ -182,7 +182,7 @@ final class DiffusionRepositoryController extends DiffusionController { } $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $drequest->generateURI( @@ -240,7 +240,7 @@ final class DiffusionRepositoryController extends DiffusionController { } $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $drequest->generateURI( diff --git a/src/applications/diffusion/view/DiffusionBranchTableView.php b/src/applications/diffusion/view/DiffusionBranchTableView.php index 4ac40d73ca..2d59c04946 100644 --- a/src/applications/diffusion/view/DiffusionBranchTableView.php +++ b/src/applications/diffusion/view/DiffusionBranchTableView.php @@ -36,7 +36,7 @@ final class DiffusionBranchTableView extends DiffusionView { } $rows[] = array( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $drequest->generateURI( diff --git a/src/applications/diffusion/view/DiffusionBrowseTableView.php b/src/applications/diffusion/view/DiffusionBrowseTableView.php index fdf1651474..2aed5dbdd3 100644 --- a/src/applications/diffusion/view/DiffusionBrowseTableView.php +++ b/src/applications/diffusion/view/DiffusionBrowseTableView.php @@ -204,7 +204,7 @@ final class DiffusionBrowseTableView extends DiffusionView { $request->getRepository()->getCallsign()); if ($editor_link) { $show_edit = true; - $editor_button = phutil_render_tag( + $editor_button = phutil_tag( 'a', array( 'href' => $editor_link, diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php index afa52d9d36..df5f139307 100644 --- a/src/applications/diffusion/view/DiffusionView.php +++ b/src/applications/diffusion/view/DiffusionView.php @@ -47,7 +47,7 @@ abstract class DiffusionView extends AphrontView { 'path' => $path, )); - return phutil_render_tag( + return phutil_tag( 'a', array( 'href' => $href, diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 841f38de61..0302df17ec 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -109,7 +109,7 @@ final class PhabricatorDirectoryMainController $panel->setHeader('Unbreak Now!'); $panel->setCaption('Open tasks with "Unbreak Now!" priority.'); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/view/all/', @@ -154,7 +154,7 @@ final class PhabricatorDirectoryMainController 'projects you are a member of.'); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( // TODO: This should filter to just your projects' need-triage @@ -198,7 +198,7 @@ final class PhabricatorDirectoryMainController $panel->setCaption('Revisions waiting for you for review or commit.'); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/differential/', @@ -248,7 +248,7 @@ final class PhabricatorDirectoryMainController $panel->setHeader('Assigned Tasks'); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/', @@ -294,7 +294,7 @@ final class PhabricatorDirectoryMainController require_celerity_resource('phabricator-jump-nav'); $doc_href = PhabricatorEnv::getDocLink('article/Jump_Nav_User_Guide.html'); - $doc_link = phutil_render_tag( + $doc_link = phutil_tag( 'a', array( 'href' => $doc_href, @@ -381,7 +381,7 @@ final class PhabricatorDirectoryMainController $panel->setCaption('Commits awaiting your audit.'); $panel->appendChild($view); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/audit/', @@ -426,7 +426,7 @@ final class PhabricatorDirectoryMainController $panel->setCaption('Commits which auditors have raised concerns about.'); $panel->appendChild($view); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/audit/', diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php index 876866448f..12e52fdaa9 100644 --- a/src/applications/fact/controller/PhabricatorFactChartController.php +++ b/src/applications/fact/controller/PhabricatorFactChartController.php @@ -53,7 +53,7 @@ final class PhabricatorFactChartController extends PhabricatorFactController { $y = array_values($points); $id = celerity_generate_unique_node_id(); - $chart = phutil_render_tag( + $chart = phutil_tag( 'div', array( 'id' => $id, diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php index 2c8ce155b9..74c5455e84 100644 --- a/src/applications/files/controller/PhabricatorFileUploadController.php +++ b/src/applications/files/controller/PhabricatorFileUploadController.php @@ -104,7 +104,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController { $doc_href = PhabricatorEnv::getDocLink( 'article/Configuring_File_Upload_Limits.html'); - $doc_link = phutil_render_tag( + $doc_link = phutil_tag( 'a', array( 'href' => $doc_href, diff --git a/src/applications/flag/view/PhabricatorFlagListView.php b/src/applications/flag/view/PhabricatorFlagListView.php index a1f86d5ffe..332f683418 100644 --- a/src/applications/flag/view/PhabricatorFlagListView.php +++ b/src/applications/flag/view/PhabricatorFlagListView.php @@ -20,7 +20,7 @@ final class PhabricatorFlagListView extends AphrontView { $class = PhabricatorFlagColor::getCSSClass($flag->getColor()); $rows[] = array( - phutil_render_tag( + phutil_tag( 'div', array( 'class' => 'phabricator-flag-icon '.$class, @@ -36,7 +36,7 @@ final class PhabricatorFlagListView extends AphrontView { 'action' => '/flag/edit/'.$flag->getObjectPHID().'/', 'sigil' => 'workflow', ), - phutil_render_tag( + phutil_tag( 'button', array( 'class' => 'small grey', @@ -49,7 +49,7 @@ final class PhabricatorFlagListView extends AphrontView { 'action' => '/flag/delete/'.$flag->getID().'/', 'sigil' => 'workflow', ), - phutil_render_tag( + phutil_tag( 'button', array( 'class' => 'small grey', diff --git a/src/applications/herald/controller/HeraldHomeController.php b/src/applications/herald/controller/HeraldHomeController.php index 16df2de2c2..c058881e31 100644 --- a/src/applications/herald/controller/HeraldHomeController.php +++ b/src/applications/herald/controller/HeraldHomeController.php @@ -98,7 +98,7 @@ final class HeraldHomeController extends HeraldController { if ($can_create) { $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/herald/new/'.$this->contentType.'/'.$this->ruleType.'/', diff --git a/src/applications/herald/controller/HeraldTranscriptListController.php b/src/applications/herald/controller/HeraldTranscriptListController.php index 256aa7588c..c4d131fb80 100644 --- a/src/applications/herald/controller/HeraldTranscriptListController.php +++ b/src/applications/herald/controller/HeraldTranscriptListController.php @@ -58,7 +58,7 @@ final class HeraldTranscriptListController extends HeraldController { $handles[$xscript['objectPHID']]->renderLink(), $xscript['dryRun'] ? 'Yes' : '', number_format((int)(1000 * $xscript['duration'])).' ms', - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/herald/transcript/'.$xscript['id'].'/', diff --git a/src/applications/herald/view/HeraldRuleListView.php b/src/applications/herald/view/HeraldRuleListView.php index 2bfe609bdf..18aa093b61 100644 --- a/src/applications/herald/view/HeraldRuleListView.php +++ b/src/applications/herald/view/HeraldRuleListView.php @@ -51,7 +51,7 @@ final class HeraldRuleListView extends AphrontView { ), $rule->getName()); - $edit_log = phutil_render_tag( + $edit_log = phutil_tag( 'a', array( 'href' => '/herald/history/'.$rule->getID().'/', diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php index 74f4d75e66..c675d4b30b 100644 --- a/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php @@ -33,7 +33,7 @@ final class PhabricatorMailingListsListController $rows[] = array( phutil_escape_html($list->getName()), phutil_escape_html($list->getEmail()), - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'button grey small', diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index cee45c4c20..cd77f4da3e 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -271,7 +271,7 @@ final class ManiphestReportController extends ManiphestController { $filter = $this->renderReportFilters($tokens, $has_window = false); $id = celerity_generate_unique_node_id(); - $chart = phutil_render_tag( + $chart = phutil_tag( 'div', array( 'id' => $id, @@ -409,12 +409,12 @@ final class ManiphestReportController extends ManiphestController { unset($result_closed['']); $base_link = '/maniphest/?users='; - $leftover_name = phutil_render_tag( + $leftover_name = phutil_tag( 'a', array( 'href' => $base_link.ManiphestTaskOwner::OWNER_UP_FOR_GRABS, ), - '(Up For Grabs)'); + phutil_render_html('em', array(), '(Up For Grabs)')); $col_header = 'User'; $header = 'Open Tasks by User and Priority ('.$date.')'; break; @@ -446,12 +446,12 @@ final class ManiphestReportController extends ManiphestController { } $base_link = '/maniphest/view/all/?projects='; - $leftover_name = phutil_render_tag( + $leftover_name = phutil_tag( 'a', array( 'href' => $base_link.ManiphestTaskOwner::PROJECT_NO_PROJECT, ), - '(No Project)'); + phutil_render_html('em', array(), '(No Project)')); $col_header = 'Project'; $header = 'Open Tasks by Project and Priority ('.$date.')'; break; diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php index 9957aa0991..ba8fcb1e85 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php @@ -54,7 +54,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { 'href' => '/maniphest/view/custom/?key='.$query->getQueryKey(), ), $query->getName()), - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/custom/edit/'.$query->getID().'/', @@ -105,7 +105,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { $panel = new AphrontPanelView(); $panel->setHeader('Saved Custom Queries'); $panel->addButton( - phutil_render_tag( + phutil_tag( 'button', array(), 'Save Default Query')); diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 13482b8f35..bbc7a4d5ac 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -89,7 +89,7 @@ final class ManiphestTaskDetailController extends ManiphestController { if ($parent_task) { $context_bar = new AphrontContextBarView(); $context_bar->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/task/create/?parent='.$parent_task->getID(), @@ -104,7 +104,7 @@ final class ManiphestTaskDetailController extends ManiphestController { $context_bar = new AphrontContextBarView(); $context_bar->addButton(''); $context_bar->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/task/create/?template='.$task->getID(), @@ -112,7 +112,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ), 'Similar Task')); $context_bar->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/maniphest/task/create/', diff --git a/src/applications/maniphest/controller/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php index 3b8db2ed52..1508690729 100644 --- a/src/applications/maniphest/controller/ManiphestTaskListController.php +++ b/src/applications/maniphest/controller/ManiphestTaskListController.php @@ -661,14 +661,14 @@ final class ManiphestTaskListController extends ManiphestController { ), 'Clear Selection'); - $submit = phutil_render_tag( + $submit = phutil_tag( 'button', array( 'id' => 'batch-select-submit', 'disabled' => 'disabled', 'class' => 'disabled', ), - 'Batch Edit Selected Tasks »'); + "Batch Edit Selected Tasks \xC2\xBB"); $export = javelin_render_tag( 'a', diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php index d3658cdf29..e3997c0c0b 100644 --- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php +++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php @@ -84,7 +84,7 @@ final class PhabricatorApplicationLaunchView extends AphrontView { $classes[] = 'app-'.$icon.'-light-large'; } - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => implode(' ', $classes), diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAListController.php b/src/applications/metamta/controller/PhabricatorMetaMTAListController.php index bcd6897ea0..5e419987c4 100644 --- a/src/applications/metamta/controller/PhabricatorMetaMTAListController.php +++ b/src/applications/metamta/controller/PhabricatorMetaMTAListController.php @@ -68,7 +68,7 @@ final class PhabricatorMetaMTAListController phabricator_format_relative_time_detailed( time() - $mail->getDateModified()), phutil_escape_html($mail->getSubject()), - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'button small grey', diff --git a/src/applications/metamta/controller/PhabricatorMetaMTASendController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendController.php index ae3b1afc68..bf1917e430 100644 --- a/src/applications/metamta/controller/PhabricatorMetaMTASendController.php +++ b/src/applications/metamta/controller/PhabricatorMetaMTASendController.php @@ -48,7 +48,7 @@ final class PhabricatorMetaMTASendController $doclink_href = PhabricatorEnv::getDoclink( 'article/Configuring_Outbound_Email.html'); - $doclink = phutil_render_tag( + $doclink = phutil_tag( 'a', array( 'href' => $doclink_href, @@ -77,7 +77,7 @@ final class PhabricatorMetaMTASendController $phdlink_href = PhabricatorEnv::getDoclink( 'article/Managing_Daemons_with_phd.html'); - $phdlink = phutil_render_tag( + $phdlink = phutil_tag( 'a', array( 'href' => $phdlink_href, diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php index 969b139b52..b25365c607 100644 --- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php +++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php @@ -32,7 +32,7 @@ final class PhabricatorNotificationPanelController '

'. $content. '
'. - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/notification/', diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php index 5425be4d8d..3c782427a3 100644 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php @@ -107,7 +107,7 @@ extends PhabricatorOAuthClientBaseController { $panel = new AphrontPanelView(); if ($this->isClientEdit()) { - $delete_button = phutil_render_tag( + $delete_button = phutil_tag( 'a', array( 'href' => $client->getDeleteURI(), diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php index 072167576a..51104ae880 100644 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php @@ -47,7 +47,7 @@ extends PhabricatorOAuthClientBaseController { ), $client->getRedirectURI() ), - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'small button grey', diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php index b9c2f277b6..975b394f7b 100644 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php @@ -84,7 +84,7 @@ extends PhabricatorOAuthClientBaseController { $panel->appendChild($form); $admin_panel = null; if ($client->getCreatorPHID() == $current_user->getPHID()) { - $edit_button = phutil_render_tag( + $edit_button = phutil_tag( 'a', array( 'href' => $client->getEditURI(), diff --git a/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php index ad834f75cf..06faaf208b 100644 --- a/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php +++ b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php @@ -45,7 +45,7 @@ extends PhabricatorOAuthClientAuthorizationBaseController { $current_user); $panel = new AphrontPanelView(); - $delete_button = phutil_render_tag( + $delete_button = phutil_tag( 'a', array( 'href' => $authorization->getDeleteURI(), diff --git a/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php index c74b040296..563a2816f4 100644 --- a/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php +++ b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php @@ -72,7 +72,7 @@ extends PhabricatorOAuthClientAuthorizationBaseController { $authorization->getDateModified(), $current_user ), - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'small button grey', diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php index 485a3014ab..5046a740b7 100644 --- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php +++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php @@ -129,7 +129,7 @@ final class PhabricatorOwnersDetailController ), 'Delete Package')); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/owners/edit/'.$package->getID().'/', @@ -164,7 +164,7 @@ final class PhabricatorOwnersDetailController $commit_views[] = array( 'view' => $view, 'header' => 'Commits in this Package that Need Attention', - 'button' => phutil_render_tag( + 'button' => phutil_tag( 'a', array( 'href' => $commit_uri->alter('status', 'open'), @@ -189,7 +189,7 @@ final class PhabricatorOwnersDetailController $commit_views[] = array( 'view' => $view, 'header' => 'Recent Commits in Package', - 'button' => phutil_render_tag( + 'button' => phutil_tag( 'a', array( 'href' => $commit_uri, diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php index 1d3e8515b8..63beb71670 100644 --- a/src/applications/paste/controller/PhabricatorPasteEditController.php +++ b/src/applications/paste/controller/PhabricatorPasteEditController.php @@ -153,7 +153,7 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController { ->setCustomClass('PhabricatorMonospaced') ->setName('text')); } else { - $fork_link = phutil_render_tag( + $fork_link = phutil_tag( 'a', array( 'href' => $this->getApplicationURI('?parent='.$paste->getID()) diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php index ad9754bc1c..b37667196b 100644 --- a/src/applications/people/application/PhabricatorApplicationPeople.php +++ b/src/applications/people/application/PhabricatorApplicationPeople.php @@ -63,7 +63,7 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication { ); $item->appendChild( - phutil_render_tag( + phutil_tag( 'span', array( 'class' => implode(' ', $classes), diff --git a/src/applications/people/controller/PhabricatorEmailVerificationController.php b/src/applications/people/controller/PhabricatorEmailVerificationController.php index 9f69293dcc..221df9d2a5 100644 --- a/src/applications/people/controller/PhabricatorEmailVerificationController.php +++ b/src/applications/people/controller/PhabricatorEmailVerificationController.php @@ -24,7 +24,7 @@ final class PhabricatorEmailVerificationController $user->getPHID(), $this->code); - $home_link = phutil_render_tag( + $home_link = phutil_tag( 'a', array( 'href' => '/', @@ -32,7 +32,7 @@ final class PhabricatorEmailVerificationController 'Continue to Phabricator'); $home_link = '

'.$home_link.'

'; - $settings_link = phutil_render_tag( + $settings_link = phutil_tag( 'a', array( 'href' => '/settings/panel/email/', diff --git a/src/applications/people/controller/PhabricatorPeopleEditController.php b/src/applications/people/controller/PhabricatorPeopleEditController.php index 661957c901..d5e0ca8f0c 100644 --- a/src/applications/people/controller/PhabricatorPeopleEditController.php +++ b/src/applications/people/controller/PhabricatorPeopleEditController.php @@ -660,7 +660,7 @@ final class PhabricatorPeopleEditController } private function getRoleInstructions() { - $roles_link = phutil_render_tag( + $roles_link = phutil_tag( 'a', array( 'href' => PhabricatorEnv::getDoclink( diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php index d0f1d715a9..f29efb5335 100644 --- a/src/applications/people/controller/PhabricatorPeopleLdapController.php +++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php @@ -153,7 +153,7 @@ final class PhabricatorPeopleLdapController private function renderUserInputs($user) { $username = $user[0]; - $inputs = phutil_render_tag( + $inputs = phutil_tag( 'input', array( 'type' => 'checkbox', @@ -162,7 +162,7 @@ final class PhabricatorPeopleLdapController ), ''); - $inputs .= phutil_render_tag( + $inputs .= phutil_tag( 'input', array( 'type' => 'hidden', @@ -171,7 +171,7 @@ final class PhabricatorPeopleLdapController ), ''); - $inputs .= phutil_render_tag( + $inputs .= phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php index ce6f60e45a..290f77f174 100644 --- a/src/applications/people/controller/PhabricatorPeopleListController.php +++ b/src/applications/people/controller/PhabricatorPeopleListController.php @@ -58,7 +58,7 @@ final class PhabricatorPeopleListController phutil_escape_html($user->getRealName()), $status, $email, - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'button grey small', @@ -107,7 +107,7 @@ final class PhabricatorPeopleListController if ($is_admin) { $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/people/edit/', @@ -116,7 +116,7 @@ final class PhabricatorPeopleListController 'Create New Account')); if (PhabricatorEnv::getEnvConfig('ldap.auth-enabled')) { $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/people/ldap/', diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php index 2c0cd075a4..0a04ec542e 100644 --- a/src/applications/phame/controller/post/PhamePostPublishController.php +++ b/src/applications/phame/controller/post/PhamePostPublishController.php @@ -75,7 +75,7 @@ final class PhamePostPublishController extends PhameController { array( 'style' => 'text-align: center; padding: 1em;', ), - phutil_render_tag( + phutil_tag( 'iframe', array( 'style' => 'width: 100%; height: 600px; '. diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php index 60ab1dbc5d..daae25dd53 100644 --- a/src/applications/phame/view/PhamePostView.php +++ b/src/applications/phame/view/PhamePostView.php @@ -151,7 +151,7 @@ final class PhamePostView extends AphrontView { return null; } - $fb_root = phutil_render_tag('div', + $fb_root = phutil_tag('div', array( 'id' => 'fb-root', ), @@ -173,7 +173,7 @@ final class PhamePostView extends AphrontView { $uri = $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle()); - $fb_comments = phutil_render_tag('div', + $fb_comments = phutil_tag('div', array( 'class' => 'fb-comments', 'data-href' => $uri, diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php index 2702854661..b24b00331b 100644 --- a/src/applications/phriction/controller/PhrictionDiffController.php +++ b/src/applications/phriction/controller/PhrictionDiffController.php @@ -110,7 +110,7 @@ final class PhrictionDiffController 'href' => PhrictionDocument::getSlugURI($slug), ), $current->getTitle()), - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/phriction/history/'.$document->getSlug().'/', @@ -133,7 +133,7 @@ final class PhrictionDiffController $uri = $request->getRequestURI(); if ($nav_l) { - $link_l = phutil_render_tag( + $link_l = phutil_tag( 'a', array( 'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1), @@ -145,7 +145,7 @@ final class PhrictionDiffController $link_r = null; if ($nav_r) { - $link_r = phutil_render_tag( + $link_r = phutil_tag( 'a', array( 'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1), @@ -202,7 +202,7 @@ final class PhrictionDiffController } if ($content->getID() == $current->getID()) { - return phutil_render_tag( + return phutil_tag( 'a', array( 'href' => '/phriction/edit/'.$document_id.'/', diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php index f48e562d18..48e07a6de5 100644 --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -47,14 +47,14 @@ final class PhrictionDocumentController $create_uri = '/phriction/edit/?slug='.$slug; $create_sentence = 'You can '. - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $create_uri, ), 'create a new document'). '.'; - $button = phutil_render_tag( + $button = phutil_tag( 'a', array( 'href' => $create_uri, diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php index e5ebe1bf11..72a6f50c0f 100644 --- a/src/applications/phriction/controller/PhrictionEditController.php +++ b/src/applications/phriction/controller/PhrictionEditController.php @@ -159,7 +159,7 @@ final class PhrictionEditController $panel_header = 'Edit Phriction Document'; $submit_button = 'Save Changes'; if ($document->getStatus() != PhrictionDocumentStatus::STATUS_DELETED) { - $delete_button = phutil_render_tag( + $delete_button = phutil_tag( 'a', array( 'href' => '/phriction/delete/'.$document->getID().'/', @@ -183,7 +183,7 @@ final class PhrictionEditController ($draft->getDraft() != $content->getContent())) { $content_text = $draft->getDraft(); - $discard = phutil_render_tag( + $discard = phutil_tag( 'a', array( 'href' => $request->getRequestURI()->alter('nodraft', true), diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php index 35cc7e1a44..29f92e4b0d 100644 --- a/src/applications/phriction/controller/PhrictionHistoryController.php +++ b/src/applications/phriction/controller/PhrictionHistoryController.php @@ -54,7 +54,7 @@ final class PhrictionHistoryController $uri = $diff_uri ->alter('l', $content->getVersion() - 1) ->alter('r', $content->getVersion()); - $vs_previous = phutil_render_tag( + $vs_previous = phutil_tag( 'a', array( 'href' => $uri, @@ -68,7 +68,7 @@ final class PhrictionHistoryController ->alter('l', $content->getVersion()) ->alter('r', $current->getVersion()); - $vs_head = phutil_render_tag( + $vs_head = phutil_tag( 'a', array( 'href' => $uri, diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php index b1eff0f88d..ae4adba176 100644 --- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php +++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php @@ -133,7 +133,7 @@ final class PhabricatorProjectMembersEditController ->setHandles($handles); foreach ($handles as $handle) { - $hidden_input = phutil_render_tag( + $hidden_input = phutil_tag( 'input', array( 'type' => 'hidden', diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index cb0d7e6d0e..d843874993 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -91,7 +91,7 @@ final class PhabricatorProjectProfileController 'action' => '/project/update/'.$project->getID().'/join/', 'method' => 'post', ), - phutil_render_tag( + phutil_tag( 'button', array( 'class' => $class, @@ -261,7 +261,7 @@ final class PhabricatorProjectProfileController $open = number_format($count); - $more_link = phutil_render_tag( + $more_link = phutil_tag( 'a', array( 'href' => '/maniphest/view/all/?projects='.$project->getPHID(), diff --git a/src/applications/repository/controller/PhabricatorRepositoryController.php b/src/applications/repository/controller/PhabricatorRepositoryController.php index 918fbbced2..1f58eca9a4 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryController.php @@ -33,7 +33,7 @@ abstract class PhabricatorRepositoryController extends PhabricatorController { } protected function renderDaemonNotice() { - $documentation = phutil_render_tag( + $documentation = phutil_tag( 'a', array( 'href' => PhabricatorEnv::getDoclink( diff --git a/src/applications/repository/controller/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/PhabricatorRepositoryEditController.php index 1a463908a5..bd6b43daac 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryEditController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryEditController.php @@ -348,7 +348,7 @@ final class PhabricatorRepositoryEditController } $doc_href = PhabricatorEnv::getDoclink('article/Diffusion_User_Guide.html'); - $user_guide_link = phutil_render_tag( + $user_guide_link = phutil_tag( 'a', array( 'href' => $doc_href, diff --git a/src/applications/repository/controller/PhabricatorRepositoryListController.php b/src/applications/repository/controller/PhabricatorRepositoryListController.php index 56921bd089..fd4b6fb37c 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryListController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryListController.php @@ -20,7 +20,7 @@ final class PhabricatorRepositoryListController foreach ($repos as $repo) { if ($repo->isTracked()) { - $diffusion_link = phutil_render_tag( + $diffusion_link = phutil_tag( 'a', array( 'href' => '/diffusion/'.$repo->getCallsign().'/', @@ -36,7 +36,7 @@ final class PhabricatorRepositoryListController PhabricatorRepositoryType::getNameForRepositoryType( $repo->getVersionControlSystem()), $diffusion_link, - phutil_render_tag( + phutil_tag( 'a', array( 'class' => 'button small grey', @@ -106,7 +106,7 @@ final class PhabricatorRepositoryListController $rows[] = array( phutil_escape_html($project->getName()), $repo_name, - phutil_render_tag( + phutil_tag( 'a', array( 'href' => '/repository/project/edit/'.$project->getID().'/', diff --git a/src/applications/search/view/PhabricatorSearchResultView.php b/src/applications/search/view/PhabricatorSearchResultView.php index 555f602d40..8e82d4ae03 100644 --- a/src/applications/search/view/PhabricatorSearchResultView.php +++ b/src/applications/search/view/PhabricatorSearchResultView.php @@ -44,7 +44,7 @@ final class PhabricatorSearchResultView extends AphrontView { $img = $handle->getImageURI(); if ($img) { - $img = phutil_render_tag( + $img = phutil_tag( 'div', array( 'class' => 'result-image', diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php index 64195bd14d..c6bc086e0f 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php @@ -63,7 +63,7 @@ function helloWorld() { } EXAMPLE; - $editor_doc_link = phutil_render_tag( + $editor_doc_link = phutil_tag( 'a', array( 'href' => PhabricatorEnv::getDoclink( diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php index 072c1dcb9e..057ac4436d 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php @@ -79,7 +79,7 @@ final class PhabricatorSettingsPanelEmailAddresses ), 'Remove'); - $button_primary = phutil_render_tag( + $button_primary = phutil_tag( 'a', array( 'class' => 'button small disabled', diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php index 0c33b30f0f..a0b6b06616 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php @@ -220,7 +220,7 @@ final class PhabricatorSettingsPanelSSHKeys $panel = new AphrontPanelView(); $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $this->getPanelURI('?edit=true'), diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php index 04c4e2e566..f9ec9f0a1b 100644 --- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php +++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php @@ -76,7 +76,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView { } private function renderCommentPanel() { - $status = phutil_render_tag( + $status = phutil_tag( 'div', array( 'id' => $this->getStatusID(), diff --git a/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php index 27c610f778..cd20ac4f39 100644 --- a/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php +++ b/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php @@ -126,7 +126,7 @@ final class PhabricatorXHProfProfileTopLevelView if ($this->file) { $panel->addButton( - phutil_render_tag( + phutil_tag( 'a', array( 'href' => $this->file->getBestURI(), diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php index c1f54033fc..e16d75f799 100644 --- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php +++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php @@ -114,7 +114,7 @@ final class CelerityStaticResourceResponse { 'href' => $uri, )); case 'js': - return phutil_render_tag( + return phutil_tag( 'script', array( 'type' => 'text/javascript', diff --git a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php index 17ce6e596b..ba773721e1 100644 --- a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php +++ b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php @@ -19,7 +19,7 @@ final class PhabricatorInlineSummaryView extends AphrontView { } private function renderHeader() { - return phutil_render_tag( + return phutil_tag( 'div', array( 'class' => 'phabricator-inline-summary', diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php index 2664e16c52..f4e11e4cc6 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php @@ -23,7 +23,7 @@ final class PhabricatorRemarkupRuleYoutube $youtube_src = 'https://www.youtube.com/embed/'.$v; $iframe = '
'. - phutil_render_tag( + phutil_tag( 'iframe', array( 'width' => '650', diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php index 424b011990..f02f165fb9 100644 --- a/src/view/control/AphrontCursorPagerView.php +++ b/src/view/control/AphrontCursorPagerView.php @@ -88,7 +88,7 @@ final class AphrontCursorPagerView extends AphrontView { $links = array(); if ($this->afterID || ($this->beforeID && $this->moreResults)) { - $links[] = phutil_render_tag( + $links[] = phutil_tag( 'a', array( 'href' => $this->uri @@ -99,7 +99,7 @@ final class AphrontCursorPagerView extends AphrontView { } if ($this->prevPageID) { - $links[] = phutil_render_tag( + $links[] = phutil_tag( 'a', array( 'href' => $this->uri @@ -110,7 +110,7 @@ final class AphrontCursorPagerView extends AphrontView { } if ($this->nextPageID) { - $links[] = phutil_render_tag( + $links[] = phutil_tag( 'a', array( 'href' => $this->uri diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php index c3bffde73f..d723907554 100644 --- a/src/view/control/AphrontTableView.php +++ b/src/view/control/AphrontTableView.php @@ -181,7 +181,7 @@ final class AphrontTableView extends AphrontView { $classes[] = 'aphront-table-view-sortable-selected'; } - $sort_glyph = phutil_render_tag( + $sort_glyph = phutil_tag( 'span', array( 'class' => $sort_glyph_class, diff --git a/src/view/form/control/AphrontFormDateControl.php b/src/view/form/control/AphrontFormDateControl.php index 4d398f2fa5..aefdafbd75 100644 --- a/src/view/form/control/AphrontFormDateControl.php +++ b/src/view/form/control/AphrontFormDateControl.php @@ -234,7 +234,7 @@ final class AphrontFormDateControl extends AphrontFormControl { ), ''); - $time_sel = phutil_render_tag( + $time_sel = phutil_tag( 'input', array( 'name' => $this->getTimeInputName(), diff --git a/src/view/form/control/AphrontFormDragAndDropUploadControl.php b/src/view/form/control/AphrontFormDragAndDropUploadControl.php index 9f6f521068..d25c6190a8 100644 --- a/src/view/form/control/AphrontFormDragAndDropUploadControl.php +++ b/src/view/form/control/AphrontFormDragAndDropUploadControl.php @@ -46,7 +46,7 @@ final class AphrontFormDragAndDropUploadControl extends AphrontFormControl { 'activatedClass' => $this->activatedClass, )); - return phutil_render_tag( + return phutil_tag( 'div', array( 'id' => $list_id, diff --git a/src/view/form/control/AphrontFormImageControl.php b/src/view/form/control/AphrontFormImageControl.php index c806ea38fc..0953eabbf1 100644 --- a/src/view/form/control/AphrontFormImageControl.php +++ b/src/view/form/control/AphrontFormImageControl.php @@ -26,7 +26,7 @@ final class AphrontFormImageControl extends AphrontFormControl { 'class' => 'default-image', 'id' => $id, )). - phutil_render_tag( + phutil_tag( 'label', array( 'for' => $id, diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php index 5198c0cf8d..6b601ff735 100644 --- a/src/view/form/control/PhabricatorRemarkupControl.php +++ b/src/view/form/control/PhabricatorRemarkupControl.php @@ -66,7 +66,7 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { $buttons = array(); foreach ($actions as $action => $spec) { if (idx($spec, 'spacer')) { - $buttons[] = phutil_render_tag( + $buttons[] = phutil_tag( 'span', array( 'class' => 'remarkup-assist-separator', @@ -110,7 +110,7 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { 'target' => $target, 'tabindex' => -1, ), - phutil_render_tag( + phutil_tag( 'div', array( 'class' => 'remarkup-assist sprite-icon remarkup-assist-'.$action, diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php index bceb20e981..6bea1c3e42 100644 --- a/src/view/layout/AphrontSideNavFilterView.php +++ b/src/view/layout/AphrontSideNavFilterView.php @@ -183,7 +183,7 @@ final class AphrontSideNavFilterView extends AphrontView { if ($this->flexible) { $nav_classes[] = 'has-drag-nav'; $drag_id = celerity_generate_unique_node_id(); - $flex_bar = phutil_render_tag( + $flex_bar = phutil_tag( 'div', array( 'class' => 'phabricator-nav-drag', @@ -200,7 +200,7 @@ final class AphrontSideNavFilterView extends AphrontView { $background_id = celerity_generate_unique_node_id(); $nav_classes[] = 'has-local-nav'; - $menu_background = phutil_render_tag( + $menu_background = phutil_tag( 'div', array( 'class' => 'phabricator-nav-column-background', diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php index 30bbd218f2..5aa00d9ddc 100644 --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -50,7 +50,7 @@ final class PhabricatorActionView extends AphrontView { } require_celerity_resource('sprite-icon-css'); - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => 'phabricator-action-view-icon sprite-icon '. diff --git a/src/view/layout/PhabricatorAnchorView.php b/src/view/layout/PhabricatorAnchorView.php index b363839617..2f642fab3d 100644 --- a/src/view/layout/PhabricatorAnchorView.php +++ b/src/view/layout/PhabricatorAnchorView.php @@ -30,7 +30,7 @@ final class PhabricatorAnchorView extends AphrontView { ''); } - $anchor = phutil_render_tag( + $anchor = phutil_tag( 'a', array( 'name' => $this->anchorName, diff --git a/src/view/layout/PhabricatorCrumbView.php b/src/view/layout/PhabricatorCrumbView.php index 8d756281b7..2e422a1951 100644 --- a/src/view/layout/PhabricatorCrumbView.php +++ b/src/view/layout/PhabricatorCrumbView.php @@ -54,7 +54,7 @@ final class PhabricatorCrumbView extends AphrontView { $icon = null; if ($this->icon) { $classes[] = 'phabricator-crumb-has-icon'; - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => 'phabricator-crumb-icon '. @@ -72,7 +72,7 @@ final class PhabricatorCrumbView extends AphrontView { $divider = null; if (!$this->isLastCrumb) { - $divider = phutil_render_tag( + $divider = phutil_tag( 'span', array( 'class' => 'sprite-menu phabricator-crumb-divider', diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php index 0f82ac33d7..457b0221cd 100644 --- a/src/view/layout/PhabricatorCrumbsView.php +++ b/src/view/layout/PhabricatorCrumbsView.php @@ -30,7 +30,7 @@ final class PhabricatorCrumbsView extends AphrontView { foreach ($this->actions as $action) { $icon = null; if ($action->getIcon()) { - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => 'sprite-icon action-'.$action->getIcon(), diff --git a/src/view/layout/PhabricatorObjectItemView.php b/src/view/layout/PhabricatorObjectItemView.php index 6161073f84..018cfe6ac3 100644 --- a/src/view/layout/PhabricatorObjectItemView.php +++ b/src/view/layout/PhabricatorObjectItemView.php @@ -85,7 +85,7 @@ final class PhabricatorObjectItemView extends AphrontView { foreach ($this->icons as $spec) { $icon = $spec['icon']; - $icon = phutil_render_tag( + $icon = phutil_tag( 'span', array( 'class' => 'phabricator-object-item-icon-image '. @@ -119,12 +119,12 @@ final class PhabricatorObjectItemView extends AphrontView { $attrs = null; if ($this->attributes) { $attrs = array(); - $spacer = phutil_render_tag( + $spacer = phutil_tag( 'span', array( 'class' => 'phabricator-object-item-attribute-spacer', ), - '·'); + "\xC2\xB7"); $first = true; foreach ($this->attributes as $attribute) { $attrs[] = phutil_render_tag( diff --git a/src/view/layout/PhabricatorProfileHeaderView.php b/src/view/layout/PhabricatorProfileHeaderView.php index 4c9adb37fc..f1e9746cf5 100644 --- a/src/view/layout/PhabricatorProfileHeaderView.php +++ b/src/view/layout/PhabricatorProfileHeaderView.php @@ -38,7 +38,7 @@ final class PhabricatorProfileHeaderView extends AphrontView { $image = null; if ($this->profilePicture) { - $image = phutil_render_tag( + $image = phutil_tag( 'div', array( 'class' => 'profile-header-picture-frame', diff --git a/src/view/layout/PhabricatorTagView.php b/src/view/layout/PhabricatorTagView.php index 165ed2b9fe..8755c048ef 100644 --- a/src/view/layout/PhabricatorTagView.php +++ b/src/view/layout/PhabricatorTagView.php @@ -99,7 +99,7 @@ final class PhabricatorTagView extends AphrontView { if ($this->dotColor) { $dotcolor = 'phabricator-tag-color-'.$this->dotColor; - $dot = phutil_render_tag( + $dot = phutil_tag( 'span', array( 'class' => 'phabricator-tag-dot '.$dotcolor, @@ -118,7 +118,7 @@ final class PhabricatorTagView extends AphrontView { if ($this->barColor) { $barcolor = 'phabricator-tag-color-'.$this->barColor; - $bar = phutil_render_tag( + $bar = phutil_tag( 'span', array( 'class' => 'phabricator-tag-bar '.$barcolor, diff --git a/src/view/layout/PhabricatorTimelineEventView.php b/src/view/layout/PhabricatorTimelineEventView.php index f3534d7797..7b0eb5546b 100644 --- a/src/view/layout/PhabricatorTimelineEventView.php +++ b/src/view/layout/PhabricatorTimelineEventView.php @@ -122,7 +122,7 @@ final class PhabricatorTimelineEventView extends AphrontView { array( 'class' => 'phabricator-timeline-icon-fill', ), - phutil_render_tag( + phutil_tag( 'span', array( 'class' => 'phabricator-timeline-icon sprite-icon '. @@ -141,7 +141,7 @@ final class PhabricatorTimelineEventView extends AphrontView { $title = $icon.$title; } - $wedge = phutil_render_tag( + $wedge = phutil_tag( 'div', array( 'class' => 'phabricator-timeline-wedge phabricator-timeline-border', @@ -149,7 +149,7 @@ final class PhabricatorTimelineEventView extends AphrontView { ''); $image_uri = $this->userHandle->getImageURI(); - $image = phutil_render_tag( + $image = phutil_tag( 'div', array( 'style' => 'background-image: url('.$image_uri.')', diff --git a/src/view/layout/PhabricatorTimelineView.php b/src/view/layout/PhabricatorTimelineView.php index 4def7593ea..e5d7dae568 100644 --- a/src/view/layout/PhabricatorTimelineView.php +++ b/src/view/layout/PhabricatorTimelineView.php @@ -37,7 +37,7 @@ final class PhabricatorTimelineView extends AphrontView { } public static function renderSpacer() { - return phutil_render_tag( + return phutil_tag( 'div', array( 'class' => 'phabricator-timeline-event-view '. diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index f9735a79bc..02883bb2ac 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -309,7 +309,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { 'debug' => $enable_debug, 'pageObjects' => array_fill_keys($this->pageObjects, true), )); - $container = phutil_render_tag( + $container = phutil_tag( 'div', array( 'id' => $aphlict_container_id, diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php index 588467aca6..65bd6cddc0 100644 --- a/src/view/page/menu/PhabricatorMainMenuView.php +++ b/src/view/page/menu/PhabricatorMainMenuView.php @@ -130,7 +130,7 @@ final class PhabricatorMainMenuView extends AphrontView { ), ), ), - phutil_render_tag( + phutil_tag( 'span', array( 'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-eye', @@ -151,7 +151,7 @@ final class PhabricatorMainMenuView extends AphrontView { ), ), ), - phutil_render_tag( + phutil_tag( 'span', array( 'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-app', @@ -277,7 +277,7 @@ final class PhabricatorMainMenuView extends AphrontView { 'class' => 'phabricator-main-menu-logo', 'href' => '/', ), - phutil_render_tag( + phutil_tag( 'span', array( 'class' => 'sprite-menu phabricator-main-menu-logo-image', @@ -311,7 +311,7 @@ final class PhabricatorMainMenuView extends AphrontView { ), $count_number); - $icon_tag = phutil_render_tag( + $icon_tag = phutil_tag( 'span', array( 'class' => 'sprite-menu phabricator-main-menu-alert-icon', @@ -358,7 +358,7 @@ final class PhabricatorMainMenuView extends AphrontView { } private function renderMenuIcon($name) { - return phutil_render_tag( + return phutil_tag( 'span', array( 'class' => 'phabricator-core-menu-icon '.