revive "mark everything seen" on main network page - see comments

diff --git a/boot.php b/boot.php
index 7bfab0a760ca51c5f41ab44487596666f0e04816..ad6c29b828a16a31785ad3868696a32451eaaa9f 100644 (file)
--- 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 4d3603843eb8633856c3524af7df184c128d8389..28893dda7bf0c85d6854ffbfb8ed49bb0547a493 100644 (file)
--- 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 8e802e2316bac3dcc6b9e7616e2daa255bd26441..6ce63c20d7f16d3ca4a58b3040614d997c915a2b 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"