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

more loose ends

Browse Source
This commit is contained in:
friendica 2013-08-27 18:40:33 -07:00
parent b77eaebb3a
commit 390a1ce552
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -93,7 +93,10 @@ function localize_item(&$item){
if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){ if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
$obj = json_decode_plus($item['object']); if(is_array($item['object']))
$obj = $item['object'];
else
$obj = json_decode_plus($item['object']);
if($obj['author'] && $obj['author']['link']) if($obj['author'] && $obj['author']['link'])
$author_link = get_rel_link($obj['author']['link'],'alternate'); $author_link = get_rel_link($obj['author']['link'],'alternate');

5
mod/acl.php
View File

@ -77,9 +77,8 @@ function acl_init(&$a){
// autocomplete for Contacts // autocomplete for Contacts
$r = q("SELECT COUNT(`id`) AS c FROM `contact` $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash
WHERE `uid` = %d AND `self` = 0 WHERE abook_channel = %d $sql_extra2" ,
AND `pending` = 0 $sql_extra2" ,
intval(local_user()) intval(local_user())
); );
$contact_count = (int)$r[0]['c']; $contact_count = (int)$r[0]['c'];

5
mod/photos.php
View File

@ -184,12 +184,13 @@ function photos_post(&$a) {
intval($page_owner_uid), intval($page_owner_uid),
dbesc($r[0]['resource_id']) dbesc($r[0]['resource_id'])
); );
$i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND `uid` = %d LIMIT 1", $i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1",
dbesc($r[0]['resource_id']), dbesc($r[0]['resource_id']),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($i)) { if(count($i)) {
q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d", q("UPDATE `item` SET item_restrict = (item_restrict & %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d",
intval(ITEM_DELETED),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($i[0]['mid']), dbesc($i[0]['mid']),