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

improve mod/display for local users - use their own copy if possible

Browse Source
This commit is contained in:
friendica 2013-03-02 14:46:09 -08:00
parent 0bdab225db
commit 1aa7561a2c
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mod/display.php
View File

@ -93,17 +93,29 @@ function display_content(&$a, $update = 0, $load = false) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) {
$r = q("SELECT * from item
WHERE item_restrict = 0
and uri = '%s'
AND ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and uid in ( " . stream_perms_api_uids() . " ))
$sql_extra )
group by uri limit 1",
dbesc($target_item['parent_uri'])
);
$r = null;
if(local_user()) {
$r = q("SELECT * from item
WHERE item_restrict = 0
and uid = %d
and uri = '%s'
limit 1",
intval(local_user()),
dbesc($target_item['parent_uri'])
);
}
if($r === null) {
$r = q("SELECT * from item
WHERE item_restrict = 0
and uri = '%s'
AND ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and uid in ( " . stream_perms_api_uids() . " ))
$sql_extra )
group by uri limit 1",
dbesc($target_item['parent_uri'])
);
}
}
else {

2
version.inc
View File

@ -1 +1 @@
2013-03-01.239
2013-03-02.240