aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-22 15:27:06 -0700
committerfriendica <info@friendica.com>2012-06-22 15:27:06 -0700
commit181a17bd0575874da23497f913c5fc4bdb0f1e54 (patch)
treeb2e2bd256bdb9c815132a0d2ace2ac5a176d75dd
parent99000382cd6cf13a2a4d5eb23c63490700bd7d4c (diff)
downloadvolse-hubzilla-181a17bd0575874da23497f913c5fc4bdb0f1e54.tar.gz
volse-hubzilla-181a17bd0575874da23497f913c5fc4bdb0f1e54.tar.bz2
volse-hubzilla-181a17bd0575874da23497f913c5fc4bdb0f1e54.zip
share RSS items
-rw-r--r--boot.php2
-rw-r--r--mod/share.php4
-rw-r--r--util/messages.po4
3 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index 682fafdbd..be47184aa 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 6c6098c83..c7525113e 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 b263d2258..416e30ef8 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"