Restore merge of phutil_tag.

src/applications/drydock/controller/DrydockController.php

@@ -44,7 +44,7 @@ abstract class DrydockController extends PhabricatorController {
             'href' => $lease_uri,
           ),
           $log->getLeaseID()),
-        phutil_escape_html($log->getMessage()),
+        $log->getMessage(),
         phabricator_date($log->getEpoch(), $user),
       );
     }

src/applications/drydock/controller/DrydockLeaseReleaseController.php

@@ -24,8 +24,8 @@ final class DrydockLeaseReleaseController extends DrydockController {
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Lease Not Active'))
-        ->appendChild(
-          '<p>'.pht('You can only release "active" leases.').'</p>')
+        ->appendChild(phutil_tag('p', array(), pht(
+          'You can only release "active" leases.')))
         ->addCancelButton($lease_uri);
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
@@ -35,11 +35,10 @@ final class DrydockLeaseReleaseController extends DrydockController {
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Really release lease?'))
-        ->appendChild(
-          '<p>'.pht(
-            'Releasing a lease may cause trouble for the lease holder and '.
-            'trigger cleanup of the underlying resource. It can not be '.
-            'undone. Continue?').'</p>')
+        ->appendChild(phutil_tag('p', array(), pht(
+          'Releasing a lease may cause trouble for the lease holder and '.
+          'trigger cleanup of the underlying resource. It can not be '.
+          'undone. Continue?')))
         ->addSubmitButton(pht('Release Lease'))
         ->addCancelButton($lease_uri);
 

src/applications/drydock/controller/DrydockResourceCloseController.php

@@ -24,8 +24,8 @@ final class DrydockResourceCloseController extends DrydockController {
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Resource Not Open'))
-        ->appendChild(
-          '<p>'.pht('You can only close "open" resources.').'</p>')
+        ->appendChild(phutil_tag('p', array(), pht(
+          'You can only close "open" resources.')))
         ->addCancelButton($resource_uri);
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
@@ -35,10 +35,9 @@ final class DrydockResourceCloseController extends DrydockController {
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Really close resource?'))
-        ->appendChild(
-          '<p>'.pht(
-            'Closing a resource releases all leases and destroys the '.
-            'resource. It can not be undone. Continue?').'</p>')
+        ->appendChild(phutil_tag('p', array(), pht(
+          'Closing a resource releases all leases and destroys the '.
+          'resource. It can not be undone. Continue?')))
         ->addSubmitButton(pht('Close Resource'))
         ->addCancelButton($resource_uri);