diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-04-09 05:46:34 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-04-09 05:46:34 +0300 |
| commit | cf7ed86e30ef2594bcd3c485e21fdab23356bb4f (patch) | |
| tree | 18192182fc6da9e357ac552bb54dde9a70b4e66c /core/Menu/MenuAbstract.php | |
| parent | 7fa8799e740aa0f26eebc125ff30bc3b091c7fb2 (diff) | |
Fixes #7642 Added Help link to top menu
Diffstat (limited to 'core/Menu/MenuAbstract.php')
| -rw-r--r-- | core/Menu/MenuAbstract.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index 0d77ff21d0..539cbac7e7 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -8,7 +8,6 @@ */ namespace Piwik\Menu; -use Piwik\Common; use Piwik\Plugins\SitesManager\API; use Piwik\Singleton; use Piwik\Plugin\Manager as PluginManager; @@ -218,9 +217,17 @@ abstract class MenuAbstract extends Singleton $newUrl = $edit[2]; if ($subMenuToEdit === null) { - $menuDataToEdit = @$this->menu[$mainMenuToEdit]; + if (isset($this->menu[$mainMenuToEdit])) { + $menuDataToEdit = &$this->menu[$mainMenuToEdit]; + } else { + $menuDataToEdit = null; + } } else { - $menuDataToEdit = @$this->menu[$mainMenuToEdit][$subMenuToEdit]; + if (isset($this->menu[$mainMenuToEdit][$subMenuToEdit])) { + $menuDataToEdit = &$this->menu[$mainMenuToEdit][$subMenuToEdit]; + } else { + $menuDataToEdit = null; + } } if (empty($menuDataToEdit)) { |