jenkins-bot has submitted this change and it was merged.
Change subject: Show talk pages to logged in users with fewer than 5 edits
......................................................................
Show talk pages to logged in users with fewer than 5 edits
Per discussion at T119337, the condition of having 5 edits before
the talk button to talk pages is added, was replaced by the condition
of being logged in.
Bug: T122311
Change-Id: I0c0a8d63c1bf5e1223869c8a63d3bb4ab079e0a4
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
2 files changed, 2 insertions(+), 17 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 6539231..5e76219 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -931,14 +931,7 @@
}
/**
- * Checks, if an edit count > 5.
- */
- protected function isExperiencedUser() {
- return $this->getUser()->getEditCount() > 5;
- }
-
- /**
- * Returns true, if the page can have a talk page.
+ * Returns true, if the page can have a talk page and user is logged in.
* @return boolean
*/
protected function isTalkAllowed() {
@@ -946,7 +939,7 @@
return $this->isAllowedPageAction( 'talk' ) &&
!$title->isTalkPage() &&
$title->canTalk() &&
- $this->isExperiencedUser();
+ $this->getUser()->isLoggedIn();
}
/*
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 2e9c5b2..a227d4f 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -168,14 +168,6 @@
}
/**
- * If the user is in beta mode, we assume, he is an experienced
- * user (he/she found the "beta" switch ;))
- */
- protected function isExperiencedUser() {
- return true;
- }
-
- /**
* Add talk, contributions, and uploads links at the top of the user
page.
*
* @inheritdoc
--
To view, visit https://gerrit.wikimedia.org/r/260889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c0a8d63c1bf5e1223869c8a63d3bb4ab079e0a4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Ebe123 <[email protected]>
Gerrit-Reviewer: Ebe123 <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jkatz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits