diff options
| author |   Brian Evans <grknight@gentoo.org> | 2022-07-18 09:52:28 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2022-07-18 09:52:28 -0400 |
| commit | 8ba1e661a214ba482852cd5a9ceb4cf3945fe3fb (patch) | |
| tree | e0efdfacd8a415e3bd3af04ef3d03adc779d0aff | |
| parent | Update license in template to CC-BY-SA-4.0. (diff) | |
| parent | Update license in template to CC-BY-SA-4.0. (diff) | |
| download | skin-tyrian-8ba1e661a214ba482852cd5a9ceb4cf3945fe3fb.tar.gz skin-tyrian-8ba1e661a214ba482852cd5a9ceb4cf3945fe3fb.tar.bz2 skin-tyrian-8ba1e661a214ba482852cd5a9ceb4cf3945fe3fb.zip | |
Merge branch 'wikitest'v1.35.4
Fix out-of-sync branch
Signed-off-by: Brian Evans <grknight@gentoo.org>
| -rw-r--r-- | TyrianTemplate.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/TyrianTemplate.php b/TyrianTemplate.php index c727875..a11fd4c 100644 --- a/TyrianTemplate.php +++ b/TyrianTemplate.php @@ -305,12 +305,18 @@ class TyrianTemplate extends BaseTemplate { <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-cog"></i> <?php $this->msg( 'toolbox' ) ?> <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <?php - foreach ( $this->getToolbox() as $key => $tbitem) { + $toolbox = $this->getSkin()->makeToolbox( + $this->data['nav_urls'], + $this->data['feeds'] + ); + + // Merge content that might be added to the toolbox section by hook + if ( isset( $this->data['sidebar']['TOOLBOX'] ) ) { + $toolbox = array_merge( $toolbox, $this->data['sidebar']['TOOLBOX'] ?? [] ); + } + foreach ( $toolbox as $key => $tbitem) { echo $this->makeListItem( $key, $tbitem ); } - - Hooks::Run( 'MonoBookTemplateToolboxEnd', [&$this] ); - Hooks::Run( 'SkinTemplateToolboxEnd', [ &$this, true ] ); ?> </ul> </li> |