More render_tag -> tag (misc, form inset view)

Summary: Converts some callsites.

Test Plan: Grepped; looked -- see inlines.

Reviewers: vrana

Reviewed By: vrana

CC: aran

Maniphest Tasks: T2432

Differential Revision: https://secure.phabricator.com/D4688

src/applications/herald/controller/HeraldRuleController.php

@@ -133,8 +133,8 @@ final class HeraldRuleController extends HeraldController {
             ),
             'Create New Condition'))
           ->setDescription(
-            'When '.$must_match_selector .
-            ' these conditions are met:')
+            phutil_safe_html(
+              'When '.$must_match_selector.' these conditions are met:'))
           ->setContent(javelin_tag(
             'table',
             array(
@@ -154,8 +154,9 @@ final class HeraldRuleController extends HeraldController {
               'mustcapture' => true,
             ),
             'Create New Action'))
-          ->setDescription('Take these actions '.$repetition_selector.
-            ' this rule matches:')
+          ->setDescription(
+            phutil_safe_html(
+              'Take these actions '.$repetition_selector.' this rule matches:'))
           ->setContent(javelin_tag(
               'table',
               array(

src/view/form/AphrontFormInsetView.php

@@ -68,7 +68,7 @@ final class AphrontFormInsetView extends AphrontView {
     $hidden_inputs = implode("\n", $hidden_inputs);
 
     if ($this->rightButton) {
-      $right_button = phutil_render_tag(
+      $right_button = phutil_tag(
         'div',
         array(
           'style' => 'float: right;',
@@ -77,7 +77,7 @@ final class AphrontFormInsetView extends AphrontView {
     }
 
     if ($this->description) {
-      $desc = phutil_render_tag(
+      $desc = phutil_tag(
         'p',
         array(),
         $this->description);

src/view/page/PhabricatorStandardPageView.php

@@ -255,12 +255,14 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
     $developer_warning = null;
     if (PhabricatorEnv::getEnvConfig('phabricator.show-error-callout') &&
         DarkConsoleErrorLogPluginAPI::getErrors()) {
-      $developer_warning =
-        '<div class="aphront-developer-error-callout">'.
+      $developer_warning = phutil_tag(
+        'div',
+        array(
+          'class' => 'aphront-developer-error-callout',
+        ),
         pht(
           'This page raised PHP errors. Find them in DarkConsole '.
-            'or the error log.').
-        '</div>';
+          'or the error log.'));
     }
 
     // Render the "you have unresolved setup issues..." warning.

src/view/page/menu/PhabricatorMainMenuView.php

@@ -316,15 +316,15 @@ final class PhabricatorMainMenuView extends AphrontView {
         $message_count_number = "\xE2\x88\x9E";
       }
 
-      $message_count_tag = phutil_render_tag(
+      $message_count_tag = phutil_tag(
         'span',
         array(
           'id'    => $message_count_id,
           'class' => 'phabricator-main-menu-message-count'
         ),
-        phutil_escape_html($message_count_number));
+        $message_count_number);
 
-      $message_icon_tag = phutil_render_tag(
+      $message_icon_tag = phutil_tag(
         'span',
         array(
           'class' => 'sprite-menu phabricator-main-menu-message-icon',
@@ -335,14 +335,17 @@ final class PhabricatorMainMenuView extends AphrontView {
         $container_classes[] = 'message-unread';
       }
 
-      $message_tag = phutil_render_tag(
+      $message_tag = phutil_tag(
         'a',
         array(
           'href'  => '/conpherence/',
           'class' => implode(' ', $container_classes),
           'id'    => $message_id,
         ),
-        $message_icon_tag.$message_count_tag);
+        array(
+          $message_icon_tag,
+          $message_count_tag,
+        ));
     }
 
     $count_id = celerity_generate_unique_node_id();