Restore merge of phutil_tag.

2013-02-13 14:50:15 -08:00
parent 73cce6e131
commit ef7f16180c
264 changed files with 1690 additions and 1716 deletions
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -159,8 +159,7 @@ abstract class ConpherenceController extends PhabricatorController {
        $item->addClass('hide-unread-count');
      }

-      // TODO: [HTML] Clean this up when we clean up HTML stuff in Conpherence.
-      $nav->addCustomBlock(phutil_safe_html($item->render()));
+      $nav->addCustomBlock($item->render());
    }
    if (empty($conpherences) || $read) {
      $nav->addCustomBlock($this->getNoConpherencesBlock());