diff options
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | mod/display.php | 33 | ||||
| -rw-r--r-- | mod/update_display.php | 2 |
3 files changed, 12 insertions, 24 deletions
diff --git a/include/conversation.php b/include/conversation.php index fe4ac54f5..c1748dea2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -714,6 +714,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { if($page_mode === 'preview') logger('preview: ' . print_r($threads,true)); +// Do not un-comment if smarty3 is in use // logger('page_template: ' . $page_template); // logger('nouveau: ' . print_r($threads,true)); diff --git a/mod/display.php b/mod/display.php index 2ececb262..b4e22e9a1 100644 --- a/mod/display.php +++ b/mod/display.php @@ -89,7 +89,7 @@ dbg(0); $sql_extra = public_permissions_sql(get_observer_hash()); - if($load) { + if($update && $load) { $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); @@ -97,11 +97,11 @@ dbg(0); dbg(1); $r = q("SELECT * from item WHERE item_restrict = 0 - 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 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']) ); @@ -134,28 +134,13 @@ dbg(0); } - if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { - notice( t('Access to this profile has been restricted.') . EOL); - return; - } - - if($items) { - -// if((local_user()) && (local_user() == $owner)) { -// q("UPDATE `item` SET `unseen` = 0 -// WHERE `parent` = %d AND `unseen` = 1", -// intval($r[0]['parent']) -// ); -// } - -// xchan_query($items); -// $items = fetch_post_tags($items); + $o .= conversation($a,$items,'display', $update, 'client'); + return $o; - $o .= conversation($a,$items,'display', $update, 'client'); - } /* - else { + elseif((! $update) && (! { + $r = q("SELECT `id`, item_flags FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1", dbesc($item_hash), dbesc($item_hash) diff --git a/mod/update_display.php b/mod/update_display.php index e23b29399..c8eb9c3a3 100644 --- a/mod/update_display.php +++ b/mod/update_display.php @@ -8,6 +8,8 @@ require_once('include/group.php'); function update_display_content(&$a) { $profile_uid = intval($_GET['p']); + if(! $profile_uid) + $profile_uid = (-1); $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0); header("Content-type: text/html"); echo "<!DOCTYPE html><html><body>\r\n"; |