| Index: branches/wmf-deployment/includes/Title.php |
| — | — | @@ -1290,12 +1290,12 @@ |
| 1291 | 1291 | # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssSubpage() |
| 1292 | 1292 | # and $this->userCanEditJsSubpage() from working |
| 1293 | 1293 | # XXX: right 'editusercssjs' is deprecated, for backward compatibility only |
| 1294 | | - if( $this->isCssSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('editusercss') ) |
| | 1294 | + if( $this->isCssSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('editusercss') ) |
| 1295 | 1295 | && $action != 'patrol' |
| 1296 | 1296 | && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) |
| 1297 | 1297 | { |
| 1298 | 1298 | $errors[] = array('customcssjsprotected'); |
| 1299 | | - } else if( $this->isJsSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('edituserjs') ) |
| | 1299 | + } else if( $this->isJsSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('edituserjs') ) |
| 1300 | 1300 | && $action != 'patrol' |
| 1301 | 1301 | && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) |
| 1302 | 1302 | { |
| Property changes on: branches/wmf-deployment/includes/Title.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1303 | 1303 | + /branches/REL1_15/phase3/includes/Title.php:51646 |
| /branches/wmf-deployment/includes/Title.php:53381 |
| /trunk/phase3/includes/Title.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56492 |