jenkins-bot has submitted this change and it was merged.
Change subject: Don't hook into desktop mode login page
......................................................................
Don't hook into desktop mode login page
The logo is thought for mobile only.
Follow up: Ib05f0753b0abbbc9e81ca2dcf1f1c6fe4fa7e908
Change-Id: I4df8b1c757c6bd49fa5ca1e807ef45bb963f2d91
---
M includes/MobileFrontend.hooks.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 26f8791..72c8c20 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -583,17 +583,24 @@
*/
public static function changeUserLoginCreateForm( &$tpl, $mode =
'userlogin' ) {
$context = MobileContext::singleton();
+ // do nothing in desktop mode
+ if ( !$context->shouldDisplayMobileView() ) {
+ return;
+ }
+
if (
+ // check, if the core login page should be used, or not
!$context->getMFConfig()->get( 'MFNoLoginOverride' ) &&
- !$context->isAlphaGroupMember() &&
- $context->shouldDisplayMobileView()
+ !$context->isAlphaGroupMember()
) {
+ // if not, overwrite the default login/create templates
from core with MF's own ones
if ( $mode === 'userlogin' ) {
$tpl = new UserLoginMobileTemplate( $tpl );
} else {
$tpl = new UserAccountCreateMobileTemplate(
$tpl );
}
} else {
+ // otherwise just(tm) add a logoheader, if there is any
$mfLogo = $context->getMFConfig()
->get( 'MobileFrontendLogo' );
--
To view, visit https://gerrit.wikimedia.org/r/226305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4df8b1c757c6bd49fa5ca1e807ef45bb963f2d91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: BarryTheBrowserTestBot <jdlrobson+ba...@gmail.com>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
