harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix comment permissions on display (again) and clean up an error seen in the logs

Browse Source
This commit is contained in:
friendica 2013-03-06 18:52:42 -08:00
parent 5a9dae78a2
commit 3d299f066e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ConversationObject.php
View File

@ -47,7 +47,10 @@ class Conversation extends BaseObject {
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
break; break;
case 'display': case 'display':
$this->profile_owner = $a->profile['uid']; // in this mode we set profile_owner after initialisation (from conversation()) and then
// pull some trickery which allows us to re-invoke this function afterward
// it's an ugly hack so FIXME
// $this->profile_owner = $a->profile['uid'];
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
break; break;
case 'page': case 'page':
@ -60,6 +63,7 @@ class Conversation extends BaseObject {
break; break;
} }
$this->mode = $mode; $this->mode = $mode;
} }
/** /**
@ -92,6 +96,9 @@ class Conversation extends BaseObject {
public function set_profile_owner($uid) { public function set_profile_owner($uid) {
$this->profile_owner = $uid; $this->profile_owner = $uid;
$mode = $this->get_mode();
$this->mode = null;
$this->set_mode($mode);
} }

2
include/zot.php
View File

@ -832,7 +832,7 @@ function allowed_public_recips($msg) {
$condensed_recips[] = $rr['hash']; $condensed_recips[] = $rr['hash'];
$results = array(); $results = array();
$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_hash = '%s' ", $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' ",
dbesc($hash) dbesc($hash)
); );
if($r) { if($r) {