[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Correctly handle the (default!) case where [[MediaWiki:Helpp...

2017-01-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332073 )

Change subject: Correctly handle the (default!) case where 
[[MediaWiki:Helppage]] points to an external URL
..


Correctly handle the (default!) case where [[MediaWiki:Helppage]] points to an 
external URL

Bug: T155319
Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
---
M Nimbus.skin.php
1 file changed, 20 insertions(+), 2 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index edaa0fb..628ac37 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -124,7 +124,24 @@
$recent_changes_link = SpecialPage::getTitleFor( 
'Recentchanges' );
$top_fans_link = SpecialPage::getTitleFor( 'TopUsers' );
$special_pages_link = SpecialPage::getTitleFor( 'Specialpages' 
);
-   $help_link = Title::newFromText( wfMessage( 'helppage' 
)->inContentLanguage()->text() );
+
+   // By default it's an (external) URL, hence not a valid Title.
+   // But because MediaWiki is by nature very customizable, someone
+   // might've changed it to point to a local page. Tricky!
+   // @see https://phabricator.wikimedia.org/T155319
+   $helpPage = $this->skin->msg( 'helppage' 
)->inContentLanguage()->plain();
+   if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $helpPage ) 
) {
+   $help_link = Linker::makeExternalLink(
+   $helpPage,
+   $this->skin->msg( 'help' )->plain()
+   );
+   } else {
+   $help_link = Linker::linkKnown(
+   Title::newFromText( $helpPage ),
+   $this->skin->msg( 'help' )->plain()
+   );
+   }
+
$upload_file = SpecialPage::getTitleFor( 'Upload' );
$what_links_here = SpecialPage::getTitleFor( 'Whatlinkshere' );
$preferences_link = SpecialPage::getTitleFor( 'Preferences' );
@@ -228,8 +245,9 @@
) .
'' . 
"\n";
}
+
+   echo $help_link;
?>
-   plain() ?>
plain() ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/332073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Correctly handle the (default!) case where [[MediaWiki:Helpp...

2017-01-14 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332073 )

Change subject: Correctly handle the (default!) case where 
[[MediaWiki:Helppage]] points to an external URL
..

Correctly handle the (default!) case where [[MediaWiki:Helppage]] points to an 
external URL

Bug: T155319
Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
---
M Nimbus.skin.php
1 file changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/73/332073/1

diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index edaa0fb..e03ef5d 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -124,7 +124,24 @@
$recent_changes_link = SpecialPage::getTitleFor( 
'Recentchanges' );
$top_fans_link = SpecialPage::getTitleFor( 'TopUsers' );
$special_pages_link = SpecialPage::getTitleFor( 'Specialpages' 
);
-   $help_link = Title::newFromText( wfMessage( 'helppage' 
)->inContentLanguage()->text() );
+
+   // By default it's an (external) URL, hence not a valid Title.
+   // But because MediaWiki is by nature very customizable, someone
+   // might've changed it to point to a local page. Tricky!
+   // @see https://phabricator.wikimedia.org/T155319
+   $helpPage = $this->skin->msg( 'helppage' 
)->inContentLanguage()->plain();
+   if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $helpPage ) 
) {
+   $help_link = Linker::makeExternalLink(
+   $helpPage,
+   $this->skin->msg( 'help' )->plain()
+   );
+   } else {
+   $help_link = Linker::link(
+   Title::newFromText( $helpPage ),
+   $this->skin->msg( 'help' )->plain()
+   );
+   }
+
$upload_file = SpecialPage::getTitleFor( 'Upload' );
$what_links_here = SpecialPage::getTitleFor( 'Whatlinkshere' );
$preferences_link = SpecialPage::getTitleFor( 'Preferences' );
@@ -228,8 +245,9 @@
) .
'' . 
"\n";
}
+
+   echo $help_link;
?>
-   plain() ?>
plain() ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/332073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits