Page MenuHomePhabricator

D15793.diff
No OneTemporary

D15793.diff

diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -173,14 +173,15 @@
}
private function buildDescriptionView(PholioMock $mock) {
-
$viewer = $this->getViewer();
+
$properties = id(new PHUIPropertyListView())
->setUser($viewer);
$description = $mock->getDescription();
if (strlen($description)) {
- $properties->addImageContent($description);
+ $properties->addTextContent(
+ new PHUIRemarkupView($viewer, $description));
return id(new PHUIObjectBoxView())
->setHeaderText(pht('Mock Description'))
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -92,6 +92,16 @@
$current_set++;
}
+ $description = $engine->getOutput($image, 'default');
+ if (strlen($description)) {
+ $description = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phabricator-remarkup',
+ ),
+ $description);
+ }
+
$history_uri = '/pholio/image/history/'.$image->getID().'/';
$images[] = array(
'id' => $image->getID(),
@@ -105,7 +115,7 @@
'width' => $x,
'height' => $y,
'title' => $image->getName(),
- 'descriptionMarkup' => $engine->getOutput($image, 'default'),
+ 'descriptionMarkup' => $description,
'isObsolete' => (bool)$image->getIsObsolete(),
'isImage' => $file->isViewableImage(),
'isViewable' => $file->isViewableInBrowser(),

File Metadata

Mime Type
text/plain
Expires
Mon, May 13, 10:30 PM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277805
Default Alt Text
D15793.diff (1 KB)

Event Timeline