aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-15 02:32:12 -0700
committerfriendica <info@friendica.com>2014-06-15 02:32:12 -0700
commit2d6a1795b7ae1fc5652798347d958d7ae71cb763 (patch)
treead9fffa37b6b34c683bb8ba74f8f74bf40873a3b
parent0f6c321e3f23d43e407aa3b3b424f20b56e0032d (diff)
downloadvolse-hubzilla-2d6a1795b7ae1fc5652798347d958d7ae71cb763.tar.gz
volse-hubzilla-2d6a1795b7ae1fc5652798347d958d7ae71cb763.tar.bz2
volse-hubzilla-2d6a1795b7ae1fc5652798347d958d7ae71cb763.zip
ensure item_private tracks acl fields on edit
-rw-r--r--mod/item.php11
-rw-r--r--version.inc2
2 files changed, 11 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index 7b105ee65..d32c4dcac 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -262,6 +262,7 @@ function item_post(&$a) {
if($orig_post) {
+ $private = 0;
// webpages are allowed to change ACLs after the fact. Normal conversation items aren't.
if($webpage) {
$str_group_allow = perms2str($_REQUEST['group_allow']);
@@ -275,13 +276,21 @@ function item_post(&$a) {
$str_group_deny = $orig_post['deny_gid'];
$str_contact_deny = $orig_post['deny_cid'];
}
+
+ if((strlen($str_group_allow))
+ || strlen($str_contact_allow)
+ || strlen($str_group_deny)
+ || strlen(str_contact_deny)) {
+ $private = 1;
+ }
+
+
$location = $orig_post['location'];
$coord = $orig_post['coord'];
$verb = $orig_post['verb'];
$app = $orig_post['app'];
$title = $_REQUEST['title'];
$body = $_REQUEST['body'];
- $private = $orig_post['item_private'];
$item_flags = $orig_post['item_flags'];
$item_restrict = $orig_post['item_restrict'];
$postopts = $orig_post['postopts'];
diff --git a/version.inc b/version.inc
index eb1f668e9..3d6f62bbd 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-06-14.706
+2014-06-15.707