aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-10 19:02:28 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-10 19:02:28 -0800
commite7bedf4433f4ec1eae1eae0c45dda5cd7a59569a (patch)
tree21c5cd67576a9e120461fead26d37ef426137c12
parent7ec687988746e1037d86d25186c2dd5f2addb15b (diff)
downloadvolse-hubzilla-e7bedf4433f4ec1eae1eae0c45dda5cd7a59569a.tar.gz
volse-hubzilla-e7bedf4433f4ec1eae1eae0c45dda5cd7a59569a.tar.bz2
volse-hubzilla-e7bedf4433f4ec1eae1eae0c45dda5cd7a59569a.zip
do a better job of preserving linebreaks in posts for channels that use markdown
-rw-r--r--mod/item.php1
-rw-r--r--version.inc3
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index 591dc8407..5f45a248b 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -474,6 +474,7 @@ function item_post(&$a) {
if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) {
require_once('include/bb2diaspora.php');
$body = escape_tags($body);
+ $body = str_replace("\n",'<br />', $body);
$body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body);
$body = diaspora2bb($body,true);
$body = preg_replace_callback('/\[share(.*?)\]/ism','share_unshield',$body);
diff --git a/version.inc b/version.inc
index 11ca984f2..c4168039b 100644
--- a/version.inc
+++ b/version.inc
@@ -1,2 +1 @@
-2015-11-09.1211
-
+2015-11-10.1212