Fix EZP-20412: Can not restore from trash an item to 2 locations

ezsystems · Apr 12, 2013 · 886d2f5 · 886d2f5
1 parent f999622
commit 886d2f5
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/kernel/content/restore.php b/kernel/content/restore.php
@@ -86,7 +86,6 @@
     $db = eZDB::instance();
     $db->begin();
     $locationAdded = false;
-    $mainNodeID = false;
 
     $newLocationList    = array();
     $failedLocationList = array();
@@ -99,13 +98,10 @@
 
         if ( $canCreate )
         {
-            if ( $mainNodeID === false )
-            {
-                $isMain = true;
-            }
-            $newLocationList[] = array( 'parent_node_id' => $selectedNodeID,
-                                        'is_main'        => $isMain );
-
+            $newLocationList[] = array(
+                'parent_node_id' => $selectedNodeID,
+                'is_main' => !$locationAdded
+            );
             $locationAdded = true;
         }
         else