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

Merge branch 'dev' into 3.4RC

Browse Source
This commit is contained in:
Mario Vavti
2018-04-23 11:52:32 +02:00
parent 689ced2ac0 9ac67b44e4
commit 5bd1ea0b95
42 changed files with 5488 additions and 4830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Access/PermissionLimits.php
View File

@@ -72,13 +72,13 @@ class PermissionLimits {
* @param int $channel_id
* @param string $perm (optional)
* @return
* * \b boolean false if no perm_limits set for this channel
* * \b int if $perm is set, return one of PERMS_* constants for this permission
* * \b false if no perm_limits set for this channel
* * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0
* * \b array with all permission limits, if $perm is not set
*/
static public function Get($channel_id, $perm = '') {
if($perm) {
return PConfig::Get($channel_id, 'perm_limits', $perm);
return intval(PConfig::Get($channel_id, 'perm_limits', $perm));
}
PConfig::Load($channel_id);