From 2852cbd2e89507b8d8efdb2b5a1f862333cacc8a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 15 Aug 2017 18:51:02 +0200
Subject: [PATCH] do not create unecessary references for single use objects
---
lib/tpl/dokuwiki/detail.php | 6 +-----
lib/tpl/dokuwiki/main.php | 6 +-----
lib/tpl/dokuwiki/tpl_header.php | 16 +++-------------
3 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index dae13abf1..8e65410d7 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -92,11 +92,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
<div class="tools">
<ul>
- <?php
- $menu = new \dokuwiki\Menu\DetailMenu();
- echo $menu->getListItems();
- unset($menu);
- ?>
+ <?php echo (new \dokuwiki\Menu\DetailMenu())->getListItems(); ?>
</ul>
</div>
</div>
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index dfd4b12a2..2d2151f9c 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -73,11 +73,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
<h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
<div class="tools">
<ul>
- <?php
- $menu = new \dokuwiki\Menu\PageMenu();
- echo $menu->getListItems();
- unset($menu);
- ?>
+ <?php echo (new \dokuwiki\Menu\PageMenu())->getListItems(); ?>
</ul>
</div>
</div>
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 8ec47fbbf..a5ab929f3 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,9 +46,7 @@ if (!defined('DOKU_INC')) die();
tpl_userinfo(); /* 'Logged in as ...' */
echo '</li>';
}
- $menu = new \dokuwiki\Menu\UserMenu();
- echo $menu->getListItems('action ');
- unset($menu);
+ echo (new \dokuwiki\Menu\UserMenu())->getListItems('action');
?>
</ul>
</div>
@@ -59,18 +57,10 @@ if (!defined('DOKU_INC')) die();
<h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
<?php tpl_searchform(); ?>
<div class="mobileTools">
- <?php
- $menu = new \dokuwiki\Menu\MobileMenu();
- echo $menu->getDropdown($lang['tools']);
- unset($menu);
- ?>
+ <?php echo (new \dokuwiki\Menu\MobileMenu())->getDropdown($lang['tools']); ?>
</div>
<ul>
- <?php
- $menu = new \dokuwiki\Menu\SiteMenu();
- echo $menu->getListItems('action ', false);
- unset($menu);
- ?>
+ <?php echo (new \dokuwiki\Menu\SiteMenu())->getListItems('action ', false); ?>
</ul>
</div>
--
GitLab