From 6cb020e0118777be4de6fd407d88c073eb46fd8b Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 9 Oct 2013 22:52:51 +1300
Subject: [PATCH] Refs #4202 Menu refactor done
---
core/Menu/MenuAdmin.php | 2 +-
core/Url.php | 1 -
plugins/Installation/Installation.php | 2 +-
plugins/MobileMessaging/MobileMessaging.php | 3 +--
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
index 852e252e64..4a29db3e29 100644
--- a/core/Menu/MenuAdmin.php
+++ b/core/Menu/MenuAdmin.php
@@ -41,7 +41,7 @@ class MenuAdmin extends MenuAbstract
*/
public static function addEntry($adminMenuName, $url, $displayedForCurrentUser = true, $order = 20)
{
- self::getInstance()->add('General_Settings', 'General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
+ self::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
}
/**
diff --git a/core/Url.php b/core/Url.php
index bb16135e84..6a4f4a4ad7 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -343,7 +343,6 @@ class Url
*/
static function getCurrentQueryStringWithParametersModified($params)
{
- var_dump($params);
$urlValues = self::getArrayFromCurrentQueryString();
foreach ($params as $key => $value) {
$urlValues[$key] = $value;
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 5f7bafd4e5..564b151f05 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -81,7 +81,7 @@ class Installation extends \Piwik\Plugin
{
MenuAdmin::addEntry('Installation_SystemCheck',
array('module' => 'Installation', 'action' => 'systemCheckPage'),
- $addIf = Piwik::isUserIsSuperUser(),
+ Piwik::isUserIsSuperUser(),
$order = 15);
}
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 736bdf0d3d..9e9b92d4f0 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -87,8 +87,7 @@ class MobileMessaging extends \Piwik\Plugin
function addMenu()
{
- MenuAdmin::addEntry(
- 'MobileMessaging_SettingsMenu',
+ MenuAdmin::addEntry('MobileMessaging_SettingsMenu',
array('module' => 'MobileMessaging', 'action' => 'index'),
true,
$order = 12
--
GitLab