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 "Add tests for SkinTemplate::setupSkinUserCss"
[lhc/web/wiklou.git]
/
includes
/
skins
/
SkinTemplate.php
diff --git
a/includes/skins/SkinTemplate.php
b/includes/skins/SkinTemplate.php
index
1a4554f
..
bc6dfca
100644
(file)
--- a/
includes/skins/SkinTemplate.php
+++ b/
includes/skins/SkinTemplate.php
@@
-61,7
+61,7
@@
class SkinTemplate extends Skin {
*
* @param OutputPage $out
*/
*
* @param OutputPage $out
*/
- function setupSkinUserCss( OutputPage $out ) {
+
public
function setupSkinUserCss( OutputPage $out ) {
$moduleStyles = [
'mediawiki.legacy.shared',
'mediawiki.legacy.commonPrint',
$moduleStyles = [
'mediawiki.legacy.shared',
'mediawiki.legacy.commonPrint',
@@
-1283,7
+1283,7
@@
class SkinTemplate extends Skin {
'href' => $this->getTitle()->getLocalURL( "action=info" )
];
'href' => $this->getTitle()->getLocalURL( "action=info" )
];
- if ( $this->getTitle()->exists() ) {
+ if ( $this->getTitle()->exists()
|| $this->getTitle()->inNamespace( NS_CATEGORY )
) {
$nav_urls['recentchangeslinked'] = [
'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalURL()
];
$nav_urls['recentchangeslinked'] = [
'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalURL()
];
@@
-1322,7
+1322,7
@@
class SkinTemplate extends Skin {
if ( !$user->isAnon() ) {
$sur = new UserrightsPage;
$sur->setContext( $this->getContext() );
if ( !$user->isAnon() ) {
$sur = new UserrightsPage;
$sur->setContext( $this->getContext() );
- $canChange = $sur->userCanChangeRights( $
this->getUser(), false
);
+ $canChange = $sur->userCanChangeRights( $
user
);
$nav_urls['userrights'] = [
'text' => $this->msg(
$canChange ? 'tool-link-userrights' : 'tool-link-userrights-readonly',
$nav_urls['userrights'] = [
'text' => $this->msg(
$canChange ? 'tool-link-userrights' : 'tool-link-userrights-readonly',