aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-20 20:15:53 -0700
committerfriendica <info@friendica.com>2013-09-20 20:15:53 -0700
commitfd2379530cd879861c3abab747bddffd3b3e3fdf (patch)
tree10b79d3ec820c985be05f0a78dbb4fef216441e1
parent43e290f4c05e9b558abd8118f2282898f3d488f8 (diff)
downloadvolse-hubzilla-fd2379530cd879861c3abab747bddffd3b3e3fdf.tar.gz
volse-hubzilla-fd2379530cd879861c3abab747bddffd3b3e3fdf.tar.bz2
volse-hubzilla-fd2379530cd879861c3abab747bddffd3b3e3fdf.zip
hopefully(?) the final word on remote comment permissions
-rwxr-xr-xinclude/items.php4
-rw-r--r--mod/item.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 37ff7db3c..44917233f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -63,6 +63,7 @@ function collect_recipients($item,&$private) {
}
+
function can_comment_on_post($observer_xchan,$item) {
if(! $observer_xchan)
return false;
@@ -84,9 +85,6 @@ function can_comment_on_post($observer_xchan,$item) {
if(($item['owner']['abook_xchan']) && ($item['owner']['abook_their_perms'] & PERMS_W_COMMENT))
return true;
}
- else {
- return true;
- }
break;
default:
break;
diff --git a/mod/item.php b/mod/item.php
index 2ebb02869..813bcf283 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -135,6 +135,9 @@ function item_post(&$a) {
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
+
+ // can_comment_on_post() needs info from the following xchan_query
+ xchan_query($r);
$parent_item = $r[0];
$parent = $r[0]['id'];