public forum author using private posting, correct the comment permissions downstream.

diff --git a/boot.php b/boot.php
index 06f18b7845e347a6662b99a1beb5e7f26a9935c7..e8bd1087bf048e300aafcdd5937d706398a97c13 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.1377' );
+define ( 'FRIENDICA_VERSION',      '3.0.1378' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 

diff --git a/include/items.php b/include/items.php
index 3db1a280241b661f709f78bb4ffd6cde00a1e847..05134ef8f5e35f68d85cc01129e2bcb881cae143 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -814,6 +814,12 @@ function item_store($arr,$force_parent = false) {
                        if($r[0]['private'])
                                $arr['private'] = 1;
 
+                       // Edge case. We host a public forum that was originally posted to privately.
+                       // The original author commented, but as this is a comment, the permissions
+                       // weren't fixed up so it will still show the comment as private unless we fix it here. 
+
+                       if((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private']))
+                               $arr['private'] = 0;
                }
                else {
 

diff --git a/util/messages.po b/util/messages.po
index 1529403417c96574486bc67a0781f468a260f07f..1ff1bbf1b5f16ca231859275dc26c812c4b898f9 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1377\n"
+"Project-Id-Version: 3.0.1378\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-17 10:00-0700\n"
+"POT-Creation-Date: 2012-06-18 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"