harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/items.php
	mod/item.php
This commit is contained in:
redmatrix
2015-06-23 17:30:35 -07:00
parent ae6612025d 7975bc828f
commit 833098e346
15 changed files with 181 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/items.php
View File

@@ -431,7 +431,7 @@ function post_activity_item($arr) {
if(array_key_exists('item_private',$arr) && $arr['item_private']) {
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if($channel) {
if($channel['channel_hash'] === $arr['author_xchan']) {
@@ -2102,7 +2102,7 @@ function item_store($arr, $allow_exec = false) {
$arr['lang'] = detect_language($arr['body']);
// apply the input filter here - if it is obscured it has been filtered already
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if(local_channel() && (! $arr['sig'])) {
$channel = get_app()->get_channel();
@@ -2480,8 +2480,9 @@ function item_store_update($arr,$allow_exec = false) {
if((! array_key_exists('item_obscured', $arr)) || $arr['item_obscured'] == 0) {
$arr['lang'] = detect_language($arr['body']);
// apply the input filter here - if it is obscured it has been filtered already
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if(local_channel() && (! $arr['sig'])) {
$channel = get_app()->get_channel();