dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Move getRestrictionLevels from NamespaceInfo to PermissionManager."
[lhc/web/wiklou.git]
/
includes
/
skins
/
SkinTemplate.php
diff --git
a/includes/skins/SkinTemplate.php
b/includes/skins/SkinTemplate.php
index
5fd9f1f
..
d1345b8
100644
(file)
--- a/
includes/skins/SkinTemplate.php
+++ b/
includes/skins/SkinTemplate.php
@@
-62,12
+62,10
@@
class SkinTemplate extends Skin {
* roughly equivalent to PHPTAL 0.7.
*
* @param string $classname
* roughly equivalent to PHPTAL 0.7.
*
* @param string $classname
- * @param bool|string $repository Subdirectory where we keep template files
- * @param bool|string $cache_dir
* @return QuickTemplate
* @private
*/
* @return QuickTemplate
* @private
*/
- function setupTemplate( $classname
, $repository = false, $cache_dir = false
) {
+ function setupTemplate( $classname ) {
return new $classname( $this->getConfig() );
}
return new $classname( $this->getConfig() );
}
@@
-179,7
+177,7
@@
class SkinTemplate extends Skin {
$user = $this->getUser();
$title = $this->getTitle();
$user = $this->getUser();
$title = $this->getTitle();
- $tpl = $this->setupTemplate( $this->template
, 'skins'
);
+ $tpl = $this->setupTemplate( $this->template );
$this->thispage = $title->getPrefixedDBkey();
$this->titletxt = $title->getPrefixedText();
$this->thispage = $title->getPrefixedDBkey();
$this->titletxt = $title->getPrefixedText();
@@
-587,6
+585,7
@@
class SkinTemplate extends Skin {
$request = $this->getRequest();
$pageurl = $title->getLocalURL();
$authManager = AuthManager::singleton();
$request = $this->getRequest();
$pageurl = $title->getLocalURL();
$authManager = AuthManager::singleton();
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
/* set up the default links for the personal toolbar */
$personal_urls = [];
/* set up the default links for the personal toolbar */
$personal_urls = [];
@@
-706,7
+705,7
@@
class SkinTemplate extends Skin {
];
// No need to show Talk and Contributions to anons if they can't contribute!
];
// No need to show Talk and Contributions to anons if they can't contribute!
- if (
User::
groupHasPermission( '*', 'edit' ) ) {
+ if (
$permissionManager->
groupHasPermission( '*', 'edit' ) ) {
// Because of caching, we can't link directly to the IP talk and
// contributions pages. Instead we use the special page shortcuts
// (which work correctly regardless of caching). This means we can't
// Because of caching, we can't link directly to the IP talk and
// contributions pages. Instead we use the special page shortcuts
// (which work correctly regardless of caching). This means we can't
@@
-734,7
+733,7
@@
class SkinTemplate extends Skin {
}
if ( $authManager->canAuthenticateNow() ) {
}
if ( $authManager->canAuthenticateNow() ) {
- $key =
User::
groupHasPermission( '*', 'read' )
+ $key =
$permissionManager->
groupHasPermission( '*', 'read' )
? 'login'
: 'login-private';
$personal_urls[$key] = $login_url;
? 'login'
: 'login-private';
$personal_urls[$key] = $login_url;
@@
-1070,8
+1069,8
@@
class SkinTemplate extends Skin {
}
if ( $title->quickUserCan( 'protect', $user ) && $title->getRestrictionTypes() &&
}
if ( $title->quickUserCan( 'protect', $user ) && $title->getRestrictionTypes() &&
- MediaWikiServices::getInstance()->get
NamespaceInfo()->
-
get
RestrictionLevels( $title->getNamespace(), $user ) !== [ '' ]
+ MediaWikiServices::getInstance()->get
PermissionManager()
+
->getNamespace
RestrictionLevels( $title->getNamespace(), $user ) !== [ '' ]
) {
$mode = $title->isProtected() ? 'unprotect' : 'protect';
$content_navigation['actions'][$mode] = [
) {
$mode = $title->isProtected() ? 'unprotect' : 'protect';
$content_navigation['actions'][$mode] = [
@@
-1083,7
+1082,10
@@
class SkinTemplate extends Skin {
}
// Checks if the user is logged in
}
// Checks if the user is logged in
- if ( $this->loggedin && $user->isAllowedAll( 'viewmywatchlist', 'editmywatchlist' ) ) {
+ if ( $this->loggedin && MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasAllRights( $user, 'viewmywatchlist', 'editmywatchlist' )
+ ) {
/**
* The following actions use messages which, if made particular to
* the any specific skins, would break the Ajax code which makes this
/**
* The following actions use messages which, if made particular to
* the any specific skins, would break the Ajax code which makes this