diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-11 07:26:15 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-11 07:26:15 +0100 |
| commit | 609e42cdd8facae0a673bb1a370c44225d22b1cd (patch) | |
| tree | f805a273056c4363c2c084999ac7cc02f9f3a16b | |
| parent | 23d30ab2c5ecb5275f43cd59cf3f0ea93e05c028 (diff) | |
| parent | 7235c208541c9797963b6cd364bdb61b608c06e3 (diff) | |
| download | volse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.tar.gz volse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.tar.bz2 volse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | mod/item.php | 1 | ||||
| -rw-r--r-- | version.inc | 3 |
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 |