diff options
| author | friendica <info@friendica.com> | 2015-03-17 00:13:47 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-17 00:13:47 -0700 |
| commit | 7af012b1f95fb329c9bf127a60e0a383d853e37d (patch) | |
| tree | 4416ebfbe92c35941601eb99efd310bc87d4c350 | |
| parent | bc22df9057198018f9cc490d0e3e013692f52b90 (diff) | |
| download | volse-hubzilla-7af012b1f95fb329c9bf127a60e0a383d853e37d.tar.gz volse-hubzilla-7af012b1f95fb329c9bf127a60e0a383d853e37d.tar.bz2 volse-hubzilla-7af012b1f95fb329c9bf127a60e0a383d853e37d.zip | |
The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 8f16d23c1..2518c0d4f 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'])) ? $arr['body'] : ''); + $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : ''); $arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : ''); $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); @@ -2460,7 +2460,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'])) ? $arr['body'] : ''); + $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($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'] ); diff --git a/mod/item.php b/mod/item.php index 8b45f5db9..dad883f50 100644 --- a/mod/item.php +++ b/mod/item.php @@ -385,7 +385,7 @@ function item_post(&$a) { $coord = notags(trim($_REQUEST['coord'])); $verb = notags(trim($_REQUEST['verb'])); $title = escape_tags(trim($_REQUEST['title'])); - $body = $_REQUEST['body']; + $body = trim($_REQUEST['body']); $postopts = ''; $private = ( diff --git a/version.inc b/version.inc index 430f607a5..c403615e8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-16.973 +2015-03-17.974 |