Njw has submitted this change and it was merged.
Change subject: Check that navigation section exists before using it for top
menu
......................................................................
Check that navigation section exists before using it for top menu
This is needed as it can be removed from Mediawiki:Sidebar (or from
various extensions).
Change-Id: I34c4264ae3dae2e712fce4a153e153451f460342
---
M Erudite.skin.php
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Njw: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/Erudite.skin.php b/Erudite.skin.php
index d872421..718fd8c 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -84,17 +84,17 @@
<a id="menubutton" href="#menu">Menu</a>
<div id="access" role="navigation">
- <div id="menu">
- <ul id="menu-urs" class="menu">
<?php
- foreach( $this->data['sidebar']['navigation']
as $item ) {
- printf( '<li id="menu-item-%s"
class="menu-item">', Sanitizer::escapeId( $item['id'] ) );
- printf( '<a href="%s">%s</a>',
htmlspecialchars( $item['href'] ), htmlspecialchars( $item['text'] ) );
- echo "</li>\n";
+ if( array_key_exists( 'navigation',
$this->data['sidebar'] ) ) {
+ echo "<div id='menu'><ul id='menu-urs'
class='menu'>\n";
+ foreach(
$this->data['sidebar']['navigation'] as $item ) {
+ printf( '<li id="menu-item-%s"
class="menu-item">', Sanitizer::escapeId( $item['id'] ) );
+ printf( '<a href="%s">%s</a>',
htmlspecialchars( $item['href'] ), htmlspecialchars( $item['text'] ) );
+ echo "</li>\n";
+ }
+ echo "</ul></div>\n";
}
?>
- </ul>
- </div>
</div>
</div>
<!-- /header -->
--
To view, visit https://gerrit.wikimedia.org/r/98603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34c4264ae3dae2e712fce4a153e153451f460342
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw <nick.wh...@durham.ac.uk>
Gerrit-Reviewer: Njw <nick.wh...@durham.ac.uk>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
