Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94242
Change subject: Hygiene: Fix upstream skin mobile to skin minerva fail...
......................................................................
Hygiene: Fix upstream skin mobile to skin minerva fail...
Looks like a rebase went wrong and we are redefining methods from
SkinMinerva in SkinMobile...
Change-Id: I3b39fad9b255d00df877ba112671d7a73263e5bd
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMobile.php
2 files changed, 1 insertion(+), 76 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/42/94242/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ab7104b..1113292 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -123,7 +123,7 @@
),
'random' => array(
'text' => wfMessage(
'mobile-frontend-random-button' )->escaped(),
- 'href' => SpecialPage::getTitleFor(
'Randompage' )->getLocalUrl(),
+ 'href' => SpecialPage::getTitleFor(
'Randompage' )->getLocalUrl( array( 'campaign' => 'random' ) ),
'class' => 'icon-random',
'id' => 'randomButton',
),
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index dedcaf2..378c17e 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -215,81 +215,6 @@
return $tpl;
}
- protected function prepareDiscoveryTools( QuickTemplate $tpl ) {
- global $wgMFNearby;
-
- $items = array(
- 'home' => array(
- 'text' => wfMessage(
'mobile-frontend-home-button' )->escaped(),
- 'href' => Title::newMainPage()->getLocalUrl(),
- 'class' => 'icon-home',
- ),
- 'random' => array(
- 'text' => wfMessage(
'mobile-frontend-random-button' )->escaped(),
- 'href' => SpecialPage::getTitleFor(
'Randompage' )->getLocalUrl( array( 'campaign' => 'random' ) ),
- 'class' => 'icon-random',
- 'id' => 'randomButton',
- ),
- 'nearby' => array(
- 'text' => wfMessage(
'mobile-frontend-main-menu-nearby' )->escaped(),
- 'href' => SpecialPage::getTitleFor( 'Nearby'
)->getLocalURL(),
- 'class' => 'icon-nearby jsonly',
- ),
- );
- if ( !$wgMFNearby ) {
- unset( $items['nearby'] );
- }
- $tpl->set( 'discovery_urls', $items );
- }
-
- /**
- * Prepares urls and links used by the page
- * @param QuickTemplate
- */
- protected function preparePersonalTools( QuickTemplate $tpl ) {
- $returnToTitle = $this->getTitle()->getPrefixedText();
- $donateTitle = SpecialPage::getTitleFor( 'Uploads' );
- $watchTitle = SpecialPage::getTitleFor( 'Watchlist' );
-
- // watchlist link
- $watchlistQuery = array();
- $user = $this->getUser();
- if ( $user ) {
- $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, false );
- $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, false );
- if ( $view ) {
- $watchlistQuery['watchlistview'] = $view;
- }
- if ( $filter && $view === 'feed' ) {
- $watchlistQuery['filter'] = $filter;
- }
- }
-
- $items = array(
- 'watchlist' => array(
- 'text' => wfMessage(
'mobile-frontend-main-menu-watchlist' )->escaped(),
- 'href' => $this->getUser()->isLoggedIn() ?
- $watchTitle->getLocalUrl(
$watchlistQuery ) :
- $this->getLoginUrl( array( 'returnto'
=> $watchTitle ) ),
- 'class' => 'icon-watchlist',
- ),
- 'uploads' => array(
- 'text' => wfMessage(
'mobile-frontend-main-menu-upload' )->escaped(),
- 'href' => $this->getUser()->isLoggedIn() ?
$donateTitle->getLocalUrl() :
- $this->getLoginUrl( array( 'returnto'
=> $donateTitle ) ),
- 'class' => 'icon-uploads jsonly',
- ),
- 'settings' => array(
- 'text' => wfMessage(
'mobile-frontend-main-menu-settings' )->escaped(),
- 'href' => SpecialPage::getTitleFor(
'MobileOptions' )->
- getLocalUrl( array( 'returnto' =>
$returnToTitle ) ),
- 'class' => 'icon-settings',
- ),
- 'auth' => $this->getLogInOutLink(),
- );
- $tpl->set( 'personal_urls', $items );
- }
-
/**
* Returns the site name for the footer, either as a text or <img> tag
*/
--
To view, visit https://gerrit.wikimedia.org/r/94242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b39fad9b255d00df877ba112671d7a73263e5bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
