Skip to content

Class fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ultimagriever wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Class fix #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions PrivatePageProtection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,25 @@ function privateppGetAccessError($groups, $user)
return null;
}

// In some cases, $groups is an array
if (is_array($groups) && count($groups) == 1) {
$groups = $groups[0];
}

if (is_string($groups)) {
$groups = explode('|', $groups);
}

$ugroups = $user->getEffectiveGroups(true);

# Sysop super permissions
if (in_array('sysop', $ugroups)) {
if (in_array('sysop', $ugroups) && !in_array('sysop', $groups)) {
$groups[] = 'sysop';
}

$match = array_intersect($ugroups, $groups);

if ($match) {
if (count($match) > 0) {
# group is allowed - keep processing
return null;
} else {
Expand Down Expand Up @@ -278,7 +283,7 @@ public function getSaveAccess($groups, $user)

$ugroups = $user->getEffectiveGroups(true);

if (in_array('locker', $ugroups)) {
if (count(array_intersect($groups, $ugroups)) > 0) {
# group is allowed - keep processing
return null;
} else {
Expand Down