From d5d853f37f5b42d4b78f823ed0fb154064ee0e70 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 17 May 2012 19:35:24 -0700
Subject: [PATCH] setup delivery chain for private groups (work in progress)

---
 boot.php          |  2 +-
 include/items.php | 47 ++++++++++++++++++++++++++---------------------
 util/messages.po  |  4 ++--
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/boot.php b/boot.php
index abf335aa0a..4032f26626 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1344' );
+define ( 'FRIENDICA_VERSION',      '3.0.1345' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1143      );
 
diff --git a/include/items.php b/include/items.php
index 129499967a..51e21d289b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -959,6 +959,8 @@ function tag_deliver($uid,$item_id) {
 		return;
 
 	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
+
 
 	$i = q("select * from item where id = %d and uid = %d limit 1",
 		intval($item_id),
@@ -986,30 +988,33 @@ function tag_deliver($uid,$item_id) {
 		}
 	}
 
-	if(! $mention)
+	if((! $mention) && (! $prvgroup))
 		return;
 
-	// send a notification
-
-	require_once('include/enotify.php');
-	notification(array(
-		'type'         => NOTIFY_TAGSELF,
-		'notify_flags' => $u[0]['notify-flags'],
-		'language'     => $u[0]['language'],
-		'to_name'      => $u[0]['username'],
-		'to_email'     => $u[0]['email'],
-		'uid'          => $u[0]['uid'],
-		'item'         => $item,
-		'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
-		'source_name'  => $item['author-name'],
-		'source_link'  => $item['author-link'],
-		'source_photo' => $item['author-avatar'],
-		'verb'         => ACTIVITY_TAG,
-		'otype'        => 'item'
-	));
+	if($mention) {
 
-	if(! $community_page)
-		return;
+		// send a notification
+
+		require_once('include/enotify.php');
+		notification(array(
+			'type'         => NOTIFY_TAGSELF,
+			'notify_flags' => $u[0]['notify-flags'],
+			'language'     => $u[0]['language'],
+			'to_name'      => $u[0]['username'],
+			'to_email'     => $u[0]['email'],
+			'uid'          => $u[0]['uid'],
+			'item'         => $item,
+			'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
+			'source_name'  => $item['author-name'],
+			'source_link'  => $item['author-link'],
+			'source_photo' => $item['author-avatar'],
+			'verb'         => ACTIVITY_TAG,
+			'otype'        => 'item'
+		));
+
+		if(! $community_page)
+			return;
+	}
 
 	// tgroup delivery - setup a second delivery chain
 	// prevent delivery looping - only proceed
diff --git a/util/messages.po b/util/messages.po
index eccf53ae6d..51da2038fc 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1344\n"
+"Project-Id-Version: 3.0.1345\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:00-0700\n"
+"POT-Creation-Date: 2012-05-17 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"
-- 
2.39.5