Fix logic error from r54153. By negating each individual isAllowed check, the OR...

(and not allow the action) if the user didn't have both rights rather than checking if he has either one.

diff --git a/includes/Title.php b/includes/Title.php
index adab8d4..b96011b 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1290,12 +1290,12 @@ class Title {
                # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssSubpage() 
                #      and $this->userCanEditJsSubpage() from working
                # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
-               if( $this->isCssSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('editusercss') )
+               if( $this->isCssSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('editusercss') )
                        && $action != 'patrol'
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
                {
                        $errors[] = array('customcssjsprotected');
-               } else if( $this->isJsSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('edituserjs') )
+               } else if( $this->isJsSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('edituserjs') )
                        && $action != 'patrol'
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
                {