aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-12 14:49:54 -0800
committerfriendica <info@friendica.com>2015-02-12 14:49:54 -0800
commit4ec099e7d80e0951c9cdc772a2242ad57c641896 (patch)
tree98bd271f2ab0a45aa39f5e1fada1939a055f82c7
parent8c4a526961380e4e4bd3d06f3ad730df20f1d54d (diff)
parent9ae2fc8910f9fcade50a28d2feefc63777a6c7f4 (diff)
downloadvolse-hubzilla-4ec099e7d80e0951c9cdc772a2242ad57c641896.tar.gz
volse-hubzilla-4ec099e7d80e0951c9cdc772a2242ad57c641896.tar.bz2
volse-hubzilla-4ec099e7d80e0951c9cdc772a2242ad57c641896.zip
Merge https://github.com/friendica/red into pending_merge
-rwxr-xr-xinclude/items.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index deaed18e1..91fa1d70a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1945,7 +1945,7 @@ function item_store($arr,$allow_exec = false) {
$arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : '');
- $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : '');
+ $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? $arr['body'] : '');
$arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : '');
$arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : '');
@@ -2451,7 +2451,7 @@ function item_store_update($arr,$allow_exec = false) {
$arr['item_private'] = ((array_key_exists('item_private',$arr)) ? intval($arr['item_private']) : $orig[0]['item_private']);
$arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : '');
- $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : '');
+ $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? $arr['body'] : '');
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : $orig[0]['attach']);
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : $orig[0]['app']);
// $arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : $orig[0]['item_restrict'] );