Page MenuHomePhabricator
Files F15431551

D19610.diff
No OneTemporary
Actions

D19610.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -8290,10 +8290,7 @@
'PhabricatorConfigManualActivity' => 'PhabricatorConfigEntryDAO',
'PhabricatorConfigModule' => 'Phobject',
'PhabricatorConfigModuleController' => 'PhabricatorConfigController',
- 'PhabricatorConfigOption' => array(
- 'Phobject',
- 'PhabricatorMarkupInterface',
- ),
+ 'PhabricatorConfigOption' => 'Phobject',
'PhabricatorConfigOptionType' => 'Phobject',
'PhabricatorConfigPHIDModule' => 'PhabricatorConfigModule',
'PhabricatorConfigProxySource' => 'PhabricatorConfigSource',
diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
--- a/src/applications/config/controller/PhabricatorConfigEditController.php
+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
@@ -153,30 +153,16 @@
$e_value);
}
- $engine = new PhabricatorMarkupEngine();
- $engine->setViewer($viewer);
- $engine->addObject($option, 'description');
- $engine->process();
- $description = phutil_tag(
- 'div',
- array(
- 'class' => 'phabricator-remarkup',
- ),
- $engine->getOutput($option, 'description'));
-
$form
->setUser($viewer)
->addHiddenInput('issue', $request->getStr('issue'));
- $description = $option->getDescription();
- if (strlen($description)) {
- $description_view = new PHUIRemarkupView($viewer, $description);
-
- $form
- ->appendChild(
- id(new AphrontFormMarkupControl())
- ->setLabel(pht('Description'))
- ->setValue($description_view));
+ $description = $option->newDescriptionRemarkupView($viewer);
+ if ($description) {
+ $form->appendChild(
+ id(new AphrontFormMarkupControl())
+ ->setLabel(pht('Description'))
+ ->setValue($description));
}
if ($group) {
diff --git a/src/applications/config/option/PhabricatorConfigOption.php b/src/applications/config/option/PhabricatorConfigOption.php
--- a/src/applications/config/option/PhabricatorConfigOption.php
+++ b/src/applications/config/option/PhabricatorConfigOption.php
@@ -1,8 +1,7 @@
<?php
final class PhabricatorConfigOption
- extends Phobject
- implements PhabricatorMarkupInterface {
+ extends Phobject {
private $key;
private $default;
@@ -204,43 +203,19 @@
return $this;
}
-/* -( PhabricatorMarkupInterface )----------------------------------------- */
-
- public function getMarkupFieldKey($field) {
- return $this->getKey().':'.$field;
- }
-
- public function newMarkupEngine($field) {
- return PhabricatorMarkupEngine::newMarkupEngine(array());
- }
-
- public function getMarkupText($field) {
- switch ($field) {
- case 'description':
- $text = $this->getDescription();
- break;
- case 'summary':
- $text = $this->getSummary();
- break;
+ public function newDescriptionRemarkupView(PhabricatorUser $viewer) {
+ $description = $this->getDescription();
+ if (!strlen($description)) {
+ return null;
}
- // TODO: We should probably implement this as a real Markup rule, but
- // markup rules are a bit of a mess right now and it doesn't hurt us to
- // fake this.
- $text = preg_replace(
+ // TODO: Some day, we should probably implement this as a real rule.
+ $description = preg_replace(
'/{{([^}]+)}}/',
'[[/config/edit/\\1/ | \\1]]',
- $text);
-
- return $text;
- }
-
- public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
- return $output;
- }
+ $description);
- public function shouldUseMarkupCache($field) {
- return false;
+ return new PHUIRemarkupView($viewer, $description);
}
}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 1:04 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7711484
Default Alt Text
D19610.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility