aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-21 20:39:10 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-21 20:39:10 -0700
commit25bd332aab20662e55824031dfd19dff23e248f8 (patch)
treecb3c48a6564154669e877b7794186bcd49a3f7cc
parent3763f74a104d5a9b91b3ddba5dd091640672e9bf (diff)
parent81d94dae2c5f986a5d5784f66b378d6320de2c07 (diff)
downloadvolse-hubzilla-25bd332aab20662e55824031dfd19dff23e248f8.tar.gz
volse-hubzilla-25bd332aab20662e55824031dfd19dff23e248f8.tar.bz2
volse-hubzilla-25bd332aab20662e55824031dfd19dff23e248f8.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--mod/item.php5
-rw-r--r--version.inc2
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index bc637debf..83cf3ce2d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -304,6 +304,7 @@ function item_post(&$a) {
}
}
}
+
$public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true));
if($webpage)
@@ -326,13 +327,15 @@ function item_post(&$a) {
$str_group_deny = $orig_post['deny_gid'];
$str_contact_deny = $orig_post['deny_cid'];
$public_policy = $orig_post['public_policy'];
+ $private = $orig_post['item_private'];
}
if((strlen($str_group_allow))
|| strlen($str_contact_allow)
|| strlen($str_group_deny)
|| strlen($str_contact_deny)
- || strlen($public_policy)) {
+ || strlen($public_policy)
+ || $private) {
$private = 1;
}
diff --git a/version.inc b/version.inc
index f2e8ff81c..cae357807 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-20.1038
+2015-05-21.1039