From 181a17bd0575874da23497f913c5fc4bdb0f1e54 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Jun 2012 15:27:06 -0700 Subject: [PATCH] share RSS items --- boot.php | 2 +- mod/share.php | 4 ++-- util/messages.po | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 682fafdbd3..be47184aa2 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1381' ); +define ( 'FRIENDICA_VERSION', '3.0.1382' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1149 ); diff --git a/mod/share.php b/mod/share.php index 6c6098c83c..c7525113ec 100644 --- a/mod/share.php +++ b/mod/share.php @@ -8,10 +8,10 @@ function share_init(&$a) { if((! $post_id) || (! local_user())) killme(); - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", + $r = q("SELECT item.*, contact.network FROM `item` left join contact on `item`.`contact-id` = `contact`.`id` WHERE `item`.`id` = %d LIMIT 1", intval($post_id) ); - if(! count($r) || $r[0]['private']) + if(! count($r) || ($r[0]['private'] && ($r[0]['network'] != NETWORK_FEED))) killme(); $o = ''; diff --git a/util/messages.po b/util/messages.po index b263d2258e..416e30ef8e 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1381\n" +"Project-Id-Version: 3.0.1382\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-21 10:00-0700\n" +"POT-Creation-Date: 2012-06-22 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