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

incorrect obj_type on several items

Browse Source
This commit is contained in:
redmatrix 2015-12-11 02:52:43 -08:00
parent f73c82632f
commit 9fb7a12849
6 changed files with 648 additions and 645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -1227,7 +1227,7 @@ function status_editor($a, $x, $popup = false) {
'$wait' => t('Please wait'), '$wait' => t('Please wait'),
'$permset' => t('Permission settings'), '$permset' => t('Permission settings'),
'$shortpermset' => t('permissions'), '$shortpermset' => t('permissions'),
'$ptyp' => (($notes_cid) ? 'note' : 'wall'), '$ptyp' => '',
'$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''),
'$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''),
'$post_id' => '', '$post_id' => '',

3
include/items.php
View File

@ -2349,7 +2349,7 @@ function item_store($arr, $allow_exec = false) {
return $ret; return $ret;
} }
if($arr['obj_type'] == ACTIVITY_OBJ_NOTE) if(($arr['obj_type'] == ACTIVITY_OBJ_NOTE) && (! $arr['object']))
$arr['obj_type'] = ACTIVITY_OBJ_COMMENT; $arr['obj_type'] = ACTIVITY_OBJ_COMMENT;
// is the new message multi-level threaded? // is the new message multi-level threaded?
@ -2870,6 +2870,7 @@ function send_status_notifications($post_id,$item) {
if($x) { if($x) {
foreach($x as $xx) { foreach($x as $xx) {
if($xx['author_xchan'] === $r[0]['channel_hash']) { if($xx['author_xchan'] === $r[0]['channel_hash']) {
$notify = true; $notify = true;
// check for an unfollow thread activity - we should probably decode the obj and check the id // check for an unfollow thread activity - we should probably decode the obj and check the id

1
mod/item.php
View File

@ -107,6 +107,7 @@ function item_post(&$a) {
$layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): '');
$plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : '');
$obj_type = ((x($_REQUEST,'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE); $obj_type = ((x($_REQUEST,'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE);
// allow API to bulk load a bunch of imported items with sending out a bunch of posts. // allow API to bulk load a bunch of imported items with sending out a bunch of posts.
$nopush = ((x($_REQUEST,'nopush')) ? intval($_REQUEST['nopush']) : 0); $nopush = ((x($_REQUEST,'nopush')) ? intval($_REQUEST['nopush']) : 0);

1
mod/subthread.php
View File

@ -147,7 +147,6 @@ function subthread_content(&$a) {
$arr['deny_cid'] = $item['deny_cid']; $arr['deny_cid'] = $item['deny_cid'];
$arr['deny_gid'] = $item['deny_gid']; $arr['deny_gid'] = $item['deny_gid'];
$post = item_store($arr); $post = item_store($arr);
$post_id = $post['item_id']; $post_id = $post['item_id'];

1284
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2015-12-10.1242 2015-12-11.1243