[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: Revert "Fix remaining undefined index notices"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336924 )
Change subject: Revert "Fix remaining undefined index notices"
..
Revert "Fix remaining undefined index notices"
This reverts commit 96b0ddfc5941187cec883c6e6597139ab8bc73dc.
Change-Id: If5db8a9bb256a8595d9a9aee326719b231a2c4a5
---
M SkinCologneBlue.php
1 file changed, 30 insertions(+), 78 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SkinCologneBlue.php b/SkinCologneBlue.php
index 9b2ba42..ece6172 100644
--- a/SkinCologneBlue.php
+++ b/SkinCologneBlue.php
@@ -168,38 +168,23 @@
$element = array();
$editLinkMessage =
$this->getSkin()->getTitle()->exists() ? 'editthispage' : 'create-this-page';
+ $element[] = $this->processBottomLink( 'edit',
$content_nav['views']['edit'], $editLinkMessage );
+ $element[] = $this->processBottomLink(
+ 'viewsource',
+ $content_nav['views']['viewsource'],
+ 'viewsource'
+ );
- if ( isset( $content_nav['views']['edit'] ) ) {
- $element[] = $this->processBottomLink(
- 'edit',
- $content_nav['views']['edit'],
- $editLinkMessage
- );
- }
-
- if ( isset( $content_nav['views']['viewsource'] ) ) {
- $element[] = $this->processBottomLink(
- 'viewsource',
- $content_nav['views']['viewsource'],
- 'viewsource'
- );
- }
-
- if ( isset( $content_nav['actions']['watch'] ) ) {
- $element[] = $this->processBottomLink(
- 'watch',
- $content_nav['actions']['watch'],
- 'watchthispage'
- );
- }
-
- if ( isset( $content_nav['actions']['unwatch'] ) ) {
- $element[] = $this->processBottomLink(
- 'unwatch',
- $content_nav['actions']['unwatch'],
- 'unwatchthispage'
- );
- }
+ $element[] = $this->processBottomLink(
+ 'watch',
+ $content_nav['actions']['watch'],
+ 'watchthispage'
+ );
+ $element[] = $this->processBottomLink(
+ 'unwatch',
+ $content_nav['actions']['unwatch'],
+ 'unwatchthispage'
+ );
$element[] = $this->talkLink();
@@ -208,10 +193,7 @@
$element[] = $this->processBottomLink( 'whatlinkshere',
$toolbox['whatlinkshere'] );
$element[] = $this->processBottomLink(
'recentchangeslinked', $toolbox['recentchangeslinked'] );
- if ( isset( $toolbox['contributions'] ) ) {
- $element[] = $this->processBottomLink(
'contributions', $toolbox['contributions'] );
- }
-
+ $element[] = $this->processBottomLink( 'contributions',
$toolbox['contributions'] );
if ( isset( $toolbox['emailuser'] ) ) {
$element[] = $this->processBottomLink(
'emailuser', $toolbox['emailuser'] );
}
@@ -221,14 +203,11 @@
// Second row. Privileged actions.
$element = array();
- if ( isset( $content_nav['actions']['delete'] ) ) {
- $element[] = $this->processBottomLink(
- 'delete',
- $content_nav['actions']['delete'],
- 'deletethispage'
- );
- }
-
+ $element[] = $this->processBottomLink(
+ 'delete',
+ $content_nav['actions']['delete'],
+ 'deletethispage'
+ );
if ( isset( $content_nav['actions']['undelete'] ) ) {
[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: Revert "Fix remaining undefined index notices"
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/336924 )
Change subject: Revert "Fix remaining undefined index notices"
..
Revert "Fix remaining undefined index notices"
This reverts commit 96b0ddfc5941187cec883c6e6597139ab8bc73dc.
Change-Id: If5db8a9bb256a8595d9a9aee326719b231a2c4a5
---
M SkinCologneBlue.php
1 file changed, 30 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/CologneBlue
refs/changes/24/336924/1
diff --git a/SkinCologneBlue.php b/SkinCologneBlue.php
index 9b2ba42..ece6172 100644
--- a/SkinCologneBlue.php
+++ b/SkinCologneBlue.php
@@ -168,38 +168,23 @@
$element = array();
$editLinkMessage =
$this->getSkin()->getTitle()->exists() ? 'editthispage' : 'create-this-page';
+ $element[] = $this->processBottomLink( 'edit',
$content_nav['views']['edit'], $editLinkMessage );
+ $element[] = $this->processBottomLink(
+ 'viewsource',
+ $content_nav['views']['viewsource'],
+ 'viewsource'
+ );
- if ( isset( $content_nav['views']['edit'] ) ) {
- $element[] = $this->processBottomLink(
- 'edit',
- $content_nav['views']['edit'],
- $editLinkMessage
- );
- }
-
- if ( isset( $content_nav['views']['viewsource'] ) ) {
- $element[] = $this->processBottomLink(
- 'viewsource',
- $content_nav['views']['viewsource'],
- 'viewsource'
- );
- }
-
- if ( isset( $content_nav['actions']['watch'] ) ) {
- $element[] = $this->processBottomLink(
- 'watch',
- $content_nav['actions']['watch'],
- 'watchthispage'
- );
- }
-
- if ( isset( $content_nav['actions']['unwatch'] ) ) {
- $element[] = $this->processBottomLink(
- 'unwatch',
- $content_nav['actions']['unwatch'],
- 'unwatchthispage'
- );
- }
+ $element[] = $this->processBottomLink(
+ 'watch',
+ $content_nav['actions']['watch'],
+ 'watchthispage'
+ );
+ $element[] = $this->processBottomLink(
+ 'unwatch',
+ $content_nav['actions']['unwatch'],
+ 'unwatchthispage'
+ );
$element[] = $this->talkLink();
@@ -208,10 +193,7 @@
$element[] = $this->processBottomLink( 'whatlinkshere',
$toolbox['whatlinkshere'] );
$element[] = $this->processBottomLink(
'recentchangeslinked', $toolbox['recentchangeslinked'] );
- if ( isset( $toolbox['contributions'] ) ) {
- $element[] = $this->processBottomLink(
'contributions', $toolbox['contributions'] );
- }
-
+ $element[] = $this->processBottomLink( 'contributions',
$toolbox['contributions'] );
if ( isset( $toolbox['emailuser'] ) ) {
$element[] = $this->processBottomLink(
'emailuser', $toolbox['emailuser'] );
}
@@ -221,14 +203,11 @@
// Second row. Privileged actions.
$element = array();
- if ( isset( $content_nav['actions']['delete'] ) ) {
- $element[] = $this->processBottomLink(
- 'delete',
- $content_nav['actions']['delete'],
- 'deletethispage'
- );
- }
-
+ $element[] = $this->processBottomLink(
+ 'delete',
+ $content_nav['actions']['delete'],
+ 'deletethispage'
+ );
if ( isset(
