From eb970b14679819e0062d95019e33639c35f2859a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 29 Sep 2015 17:14:17 +0200
Subject: [PATCH] NavigationController: Require paramter type in action remove

refs #10246
---
 application/controllers/NavigationController.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
index 26776e5da..64abe9a51 100644
--- a/application/controllers/NavigationController.php
+++ b/application/controllers/NavigationController.php
@@ -321,13 +321,17 @@ class NavigationController extends Controller
     public function removeAction()
     {
         $itemName = $this->params->getRequired('name');
+        $itemType = $this->params->getRequired('type');
+        $user = $this->Auth()->getUser();
 
         $navigationConfigForm = new NavigationConfigForm();
-        $navigationConfigForm->setUser($this->Auth()->getUser());
-        $navigationConfigForm->setShareConfig(Config::app('navigation'));
+        $navigationConfigForm->setUser($user);
+        $navigationConfigForm->setShareConfig(Config::fromIni($this->getConfigPath($itemType)));
+        $navigationConfigForm->setUserConfig(Config::fromIni($this->getConfigPath($itemType, $user->getUsername())));
+
         $form = new ConfirmRemovalForm();
         $form->setRedirectUrl('navigation');
-        $form->setTitle(sprintf($this->translate('Remove Navigation Item %s'), $itemName));
+        $form->setTitle(sprintf($this->translate('Remove %s %s'), $this->getItemLabel($itemType), $itemName));
         $form->setOnSuccess(function (ConfirmRemovalForm $form) use ($itemName, $navigationConfigForm) {
             try {
                 $itemConfig = $navigationConfigForm->delete($itemName);