share RSS items

diff --git a/boot.php b/boot.php
index 682fafdbd322c384f64161d416ce5b1481366b29..be47184aa254e541c5c52c104f88a162b622c814 100644 (file)
--- 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 6c6098c83c07363e4aec0bdaa73630829b6b3355..c7525113ec1959f543f1c0090790a9648a310b16 100644 (file)
--- 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 b263d2258ea1bfbc3ab6346f4d51c2893da3ae2e..416e30ef8e2b44aa6e932e01aab37793cd716d92 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"