jenkins-bot has submitted this change and it was merged.
Change subject: Made MobileFrontendSkinHooks::getTermsLink public
......................................................................
Made MobileFrontendSkinHooks::getTermsLink public
It is used from ZeroBanner
Also fixed code docs
Change-Id: Iee0988a1df8e392a6b7c47e485372e8af8dd80f5
---
M includes/MobileFrontend.skin.hooks.php
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.skin.hooks.php
b/includes/MobileFrontend.skin.hooks.php
index f97c7a7..bf49f9d 100644
--- a/includes/MobileFrontend.skin.hooks.php
+++ b/includes/MobileFrontend.skin.hooks.php
@@ -6,11 +6,11 @@
* Returns HTML of terms of use link or null if it shouldn't be
displayed
* Note: This is called by a hook in the WikimediaMessages extension.
*
- * @param $urlMsgKey Key of i18n message containing terms of use URL
(optional)
- *
+ * @param Skin $sk
+ * @param string $urlMsgKey Key of i18n message containing terms of use
URL (optional)
* @return null|string
*/
- protected static function getTermsLink( $sk, $urlMsgKey =
'mobile-frontend-terms-url' ) {
+ public static function getTermsLink( $sk, $urlMsgKey =
'mobile-frontend-terms-url' ) {
$urlMsg = $sk->msg( $urlMsgKey )->inContentLanguage();
if ( $urlMsg->isDisabled() ) {
return null;
@@ -45,7 +45,7 @@
// Use shorter text for some common licensing strings.
See Installer.i18n.php
// for the currently offered strings. Unfortunately,
there is no good way to
// comprehensively support localized licensing strings
since the license (as
- // stored in LocalSetttings.php) is just freeform text,
not an i18n key.
+ // stored in LocalSettings.php) is just freeform text,
not an i18n key.
$commonLicenses = array(
'Creative Commons Attribution-Share Alike 3.0'
=> 'CC BY-SA 3.0',
'Creative Commons Attribution Share Alike' =>
'CC BY-SA',
@@ -120,7 +120,7 @@
* @param QuickTemplate $tpl
* @param MobileContext $ctx
* @param Title $title
- * @param Request $req
+ * @param WebRequest $req
*/
public static function desktopFooter( $sk, $tpl, $ctx, $title, $req ) {
$footerlinks = $tpl->data['footerlinks'];
@@ -147,7 +147,8 @@
* @param QuickTemplate $tpl
* @param MobileContext $ctx
* @param Title $title
- * @param Request $req
+ * @param WebRequest $req
+ * @return QuickTemplate
*/
protected static function mobileFooter( $sk, $tpl, $ctx, $title, $req )
{
$url = $sk->getOutput()->getProperty( 'desktopUrl' );
@@ -252,4 +253,3 @@
return $sitename . $suffix;
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/248238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee0988a1df8e392a6b7c47e485372e8af8dd80f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.27.0-wmf.3
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
