jenkins-bot has submitted this change and it was merged.
Change subject: Making sure that upload rights are enforced on lazy-loaded pages
......................................................................
Making sure that upload rights are enforced on lazy-loaded pages
Bug: 68414
Change-Id: I695ceaeeef0b766c1c68f8a90ede6396185ad0e3
---
M includes/skins/SkinMinerva.php
M javascripts/common/Page.js
M templates/page.html
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 26f0f61..8825825 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -801,6 +801,7 @@
// mobile specific config variables
if ( $this->mobileContext->shouldDisplayMobileView() ) {
$vars['wgImagesDisabled'] =
$this->mobileContext->imagesDisabled();
+ $vars['wgUserCanUpload'] = $user->isAllowed(
'mf-uploadbutton' );
}
return $vars;
diff --git a/javascripts/common/Page.js b/javascripts/common/Page.js
index dd3bf6a..ad385b1 100644
--- a/javascripts/common/Page.js
+++ b/javascripts/common/Page.js
@@ -27,6 +27,7 @@
},
inBetaOrAlpha: M.isBetaGroupMember(),
isMainPage: false,
+ userCanUpload: mw.config.get( 'wgUserCanUpload' ),
talkLabel: mw.msg(
'mobile-frontend-talk-overlay-header' ),
editLabel: mw.msg( 'mobile-frontend-editor-edit' ),
languageLabel: mw.msg(
'mobile-frontend-language-article-heading' )
diff --git a/templates/page.html b/templates/page.html
index a420c57..50d1712 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -4,8 +4,8 @@
<div class="pre-content">
<h1 id="section_0">{{displayTitle}}</h1>
<ul id="page-actions" class="hlist">
- <li id="ca-edit" class="icon icon-edit icon-32px"></li><li
id="ca-upload" class="icon icon-32px">
- </li><li id="ca-talk"
+ <li id="ca-edit" class="icon icon-edit
icon-32px"></li>{{#userCanUpload}}<li id="ca-upload" class="icon icon-32px">
+ </li>{{/userCanUpload}}<li id="ca-talk"
class="{{#isTalkPage}}selected{{/isTalkPage}} icon
icon-32px icon-talk"><a href="{{talkLink}}" id="talk">{{talkLabel}}</a>
</li><li id="ca-watch"></li>
</ul>
--
To view, visit https://gerrit.wikimedia.org/r/148560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I695ceaeeef0b766c1c68f8a90ede6396185ad0e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
