Merge branch 'develop' into task/fix-scrutinizer-issues

This commit is contained in:
Hypolite Petovan
2018-01-05 09:18:14 -05:00
29 changed files with 206 additions and 157 deletions

View File

@@ -155,6 +155,13 @@ class Post extends BaseObject
$edpost = false;
}
// Editing on items of not subscribed users isn't currently possible
// There are some issues on editing that prevent this.
// But also it is an issue of the supported protocols that doesn't allow editing at all.
if ($item['uid'] == 0) {
$edpost = false;
}
if (($this->getDataValue('uid') == local_user()) || $this->isVisiting()) {
$dropping = true;
}

View File

@@ -66,8 +66,8 @@ class Email
}
/**
* @param array $mailacct mail account
* @return object
* @param array $mailacct mail account
* @return string
*/
public static function constructMailboxName($mailacct)
{