rev update - prevent messages with no parent from being counted as unseen, because...

diff --git a/boot.php b/boot.php
index 1aa5ba13ff0b797ca0efb8977c5c51a32ec154e8..60a255add8415a4f50e4eeec0c929e60d7b45ec3 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.1491' );
+define ( 'FRIENDICA_VERSION',      '3.0.1492' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/mod/ping.php b/mod/ping.php
index 9704fe7005a000ea56ec12377ae578d3978896e5..6520dc77a44a2361a37ad450464d31cca20771fa 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -63,8 +63,8 @@ function ping_init(&$a) {
                                `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
                                `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
-                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
-                                `item`.`deleted` = 0 AND `item`.`uid` = %d 
+                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND 
+                                `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`parent` != 0
                                ORDER BY `item`.`created` DESC",
                        intval(local_user())
                );

diff --git a/util/messages.po b/util/messages.po
index aa6120ae627995076b2ebe24fbb103d17ff337fa..d535adce0dec963de6c2576bbf397dc42b15f7b4 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1491\n"
+"Project-Id-Version: 3.0.1492\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-09 10:00-0700\n"
+"POT-Creation-Date: 2012-10-10 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"