From 4b7fbdfa1fa670e0002d6c42fb7bc7a93ea6dbce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Sep 2015 10:40:16 +0200
Subject: [PATCH] NavigationConfigForm: Provide proper parents when editing a
 shared item

refs #5600
---
 application/forms/Navigation/NavigationConfigForm.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/forms/Navigation/NavigationConfigForm.php b/application/forms/Navigation/NavigationConfigForm.php
index 33dab2bd4..744b7bb1b 100644
--- a/application/forms/Navigation/NavigationConfigForm.php
+++ b/application/forms/Navigation/NavigationConfigForm.php
@@ -186,7 +186,11 @@ class NavigationConfigForm extends ConfigForm
     public function listAvailableParents($type)
     {
         $shared = false;
-        if (($checkbox = $this->getElement('shared')) !== null) {
+        $children = array();
+        if ($this->itemToLoad) {
+            $shared = $this->hasBeenShared($this->itemToLoad);
+            $children = $this->getFlattenedChildren($this->itemToLoad);
+        } elseif (($checkbox = $this->getElement('shared')) !== null) {
             if ($checkbox->isChecked()) {
                 $shared = true;
             } else {
@@ -195,8 +199,6 @@ class NavigationConfigForm extends ConfigForm
             }
         }
 
-        $children = $this->itemToLoad ? $this->getFlattenedChildren($this->itemToLoad) : array();
-
         $names = array();
         if ($shared) {
             foreach ($this->getShareConfig() as $sectionName => $sectionConfig) {