From 2cfd73c57da302a1171f22a5b1b73a5d2195d3ad Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 10 Feb 2013 16:04:03 -0800
Subject: progress on mod/display - slow but any progress is good

---
 mod/display.php | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'mod/display.php')

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)
-- 
cgit v1.2.3