Page MenuHomePhabricator
Files F15481931

D13355.id32324.diff
No OneTemporary
Actions

D13355.id32324.diff
View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -437,10 +437,11 @@
->setValue($end_disabled);
}
- $description = id(new AphrontFormTextAreaControl())
+ $description = id(new PhabricatorRemarkupControl())
->setLabel(pht('Description'))
->setName('description')
- ->setValue($description);
+ ->setValue($description)
+ ->setUser($viewer);
$view_policies = id(new AphrontFormPolicyControl())
->setUser($viewer)
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -362,10 +362,19 @@
pht('Icon'),
$icon_display);
- $properties->addSectionHeader(
- pht('Description'),
- PHUIPropertyListView::ICON_SUMMARY);
- $properties->addTextContent($event->getDescription());
+ $description = PhabricatorMarkupEngine::renderOneObject(
+ id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
+ 'default',
+ $viewer);
+
+ if (strlen($event->getDescription())) {
+
+ $properties->addSectionHeader(
+ pht('Description'),
+ PHUIPropertyListView::ICON_SUMMARY);
+
+ $properties->addTextContent($description);
+ }
return $properties;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 10, 12:54 AM (2 w, 24 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7738524
Default Alt Text
D13355.id32324.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility