MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80067
Change subject: Don't redirect everything with oldid to MobileDiff
......................................................................
Don't redirect everything with oldid to MobileDiff
Bug: 49029
Change-Id: I44e51ae5a4935a8bd4330a59f3721f10dd8ae859
---
M includes/MobileContext.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobile.php
M includes/specials/SpecialMobileDiff.php
4 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/67/80067/1
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 1a614a4..f7c027d 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -291,9 +291,8 @@
*/
private function redirectMobileEnabledPages() {
$redirectUrl = null;
- if ( $this->getRequest()->getText( 'diff' ) ||
- $this->getRequest()->getText( 'oldid' ) ) {
- $redirectUrl =
SpecialMobileDiff::getMobileUrlFromDesktop();
+ if ( $this->getRequest()->getCheck( 'diff' ) ) {
+ $redirectUrl =
SpecialMobileDiff::getMobileUrlFromDesktop( $this );
}
if ( $redirectUrl ) {
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index c1aa2c9..270d8f8 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -111,6 +111,9 @@
echo $data['prebodytext'];
$this->renderPageActions( $data );
}
+ if ( $this->data['subtitle'] ) {
+ echo $this->data['subtitle'];
+ }
?>
<div id="content" class="content">
<?php
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 1d70f55..17f121b 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -162,6 +162,7 @@
) );
$tpl->set( 'pagetitle', $out->getHTMLTitle() );
+ $tpl->set( 'subtitle', $out->getSubtitle() );
$this->prepareTemplatePageContent( $tpl );
$this->prepareDiscoveryTools( $tpl );
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index fa4709c..8097558 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -272,8 +272,8 @@
return $this->getLanguage()->commaList( $userMembers );
}
- public static function getMobileUrlFromDesktop() {
- $req = MobileContext::singleton()->getRequest();
+ public static function getMobileUrlFromDesktop( IContextSource $context
) {
+ $req = $context->getRequest();
$rev2 = $req->getText( 'diff' );
$rev1 = $req->getText( 'oldid' );
// redirect requests to the diff page to mobile view
--
To view, visit https://gerrit.wikimedia.org/r/80067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e51ae5a4935a8bd4330a59f3721f10dd8ae859
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
