From 88c8387c44cced69a33e057a93e11bb77097ad31 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 26 Oct 2012 14:29:42 -0700 Subject: [PATCH] revive "mark everything seen" on main network page - see comments --- boot.php | 2 +- mod/network.php | 17 +++++++++++++---- util/messages.po | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/boot.php b/boot.php index 7bfab0a760..ad6c29b828 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1504' ); +define ( 'FRIENDICA_VERSION', '3.0.1508' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/mod/network.php b/mod/network.php index 4d3603843e..28893dda7b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -767,15 +767,24 @@ function network_content(&$a, $update = 0) { // level which items you've seen and which you haven't. If you're looking // at the top level network page just mark everything seen. -/* if((! $group) && (! $cid) && (! $star)) { + +// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact - +// and other feeds that bring in stuff from the past. One can't find it all. +// I'm reviving this block to mark everything seen on page 1 of the network as a temporary measure. +// The correct solution is to implement a network notifications box just like the system notifications popup +// with the ability in the popup to "mark all seen". +// Several people are complaining because there are unseen messages they can't find and as time goes +// on they just get buried deeper. It has happened to me a couple of times also. + + if((! $group) && (! $cid) && (! $star)) { $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` = 1 AND `uid` = %d", intval(local_user()) ); - }*/ + } - if($update_unseen) - $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen"); +// if($update_unseen) +// $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen"); // Set this so that the conversation function can find out contact info for our wall-wall items $a->page_contact = $a->contact; diff --git a/util/messages.po b/util/messages.po index 8e802e2316..6ce63c20d7 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1504\n" +"Project-Id-Version: 3.0.1508\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-22 10:00-0700\n" +"POT-Creation-Date: 2012-10-26 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- 2.39.5