aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-04 17:10:33 -0700
committerfriendica <info@friendica.com>2014-05-04 17:10:33 -0700
commitfc550ae330102eed57905b423ff2d8b8a64b48d3 (patch)
treeb782f090eb47c78201eb70c8483cf646d41a182c
parent3da4656e412730706b8e0be44dc0a751d38fdee6 (diff)
downloadvolse-hubzilla-fc550ae330102eed57905b423ff2d8b8a64b48d3.tar.gz
volse-hubzilla-fc550ae330102eed57905b423ff2d8b8a64b48d3.tar.bz2
volse-hubzilla-fc550ae330102eed57905b423ff2d8b8a64b48d3.zip
issue #432 permission changes lost editing webpage (and other non-post items)
-rwxr-xr-xinclude/items.php2
-rw-r--r--mod/item.php15
2 files changed, 11 insertions, 6 deletions
diff --git a/include/items.php b/include/items.php
index ea6a7fcb9..7a94336be 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1971,8 +1971,6 @@ function item_store($arr,$allow_exec = false) {
function item_store_update($arr,$allow_exec = false) {
-
-
$d = array('item' => $arr, 'allow_exec' => $allow_exec);
call_hooks('item_store_update', $d );
$arr = $d['item'];
diff --git a/mod/item.php b/mod/item.php
index be59bd4c7..d1952c60e 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -259,11 +259,17 @@ function item_post(&$a) {
}
+
+
if($orig_post) {
- $str_group_allow = $orig_post['allow_gid'];
- $str_contact_allow = $orig_post['allow_cid'];
- $str_group_deny = $orig_post['deny_gid'];
- $str_contact_deny = $orig_post['deny_cid'];
+ $str_group_allow = ((array_key_exists('group_allow',$_REQUEST))
+ ? perms2str($_REQUEST['group_allow']) : $orig_post['allow_gid']);
+ $str_contact_allow = ((array_key_exists('contact_allow',$_REQUEST))
+ ? perms2str($_REQUEST['contact_allow']) : $orig_post['allow_cid']);
+ $str_group_deny = ((array_key_exists('group_deny',$_REQUEST))
+ ? perms2str($_REQUEST['group_deny']) : $orig_post['deny_gid']);
+ $str_contact_deny = ((array_key_exists('contact_deny',$_REQUEST))
+ ? perms2str($_REQUEST['contact_deny']) : $orig_post['deny_cid']);
$location = $orig_post['location'];
$coord = $orig_post['coord'];
$verb = $orig_post['verb'];
@@ -305,6 +311,7 @@ function item_post(&$a) {
$str_contact_deny = perms2str($_REQUEST['contact_deny']);
}
+
$location = notags(trim($_REQUEST['location']));
$coord = notags(trim($_REQUEST['coord']));
$verb = notags(trim($_REQUEST['verb']));