Page MenuHomePhabricator

D8983.id.diff
No OneTemporary

D8983.id.diff

diff --git a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
--- a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
+++ b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
@@ -12,7 +12,7 @@
public function apply($text) {
return preg_replace_callback(
- '@^([a-zA-Z0-9:_\-]+)$@m',
+ '@^\s*([a-zA-Z0-9:_\-]+)$@m',
array($this, 'markupImageMacro'),
$text);
}
diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentQuoteController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentQuoteController.php
--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentQuoteController.php
+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentQuoteController.php
@@ -34,6 +34,7 @@
}
$content = $xaction->getComment()->getContent();
+ $content = rtrim($content, "\r\n");
$content = phutil_split_lines($content, true);
foreach ($content as $key => $line) {
if (strlen($line) && ($line[0] != '>')) {

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 8:33 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707691
Default Alt Text
D8983.id.diff (1 KB)

Event Timeline