Backported element deletion fix from trunk. It must've been there for…

…ever.
bricoleurs · Oct 21, 2005 · 826eacc · 826eacc
1 parent 59ede08
commit 826eacc
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/Bric/App/Callback/ContainerProf.pm b/lib/Bric/App/Callback/ContainerProf.pm
@@ -599,13 +599,18 @@ sub _update_parts {
 
     # Save data to tiles and put them in a usable order
     foreach my $t ($tile->get_tiles) {
-        my $id = $t->get_id();
+        my $id      = $t->get_id;
+        my $is_cont = $t->is_container;
 
         # Grab the tile we're looking for
-        local $^W = undef;
-        $locate_tile = $t if $id == $locate_id and $t->is_container;
-        if ($do_delete && ($param->{$widget . "|delete_cont$id"} ||
-                           $param->{$widget . "|delete_data$id"})) {
+        {
+            local $^W = undef;
+            $locate_tile = $t if $id == $locate_id and $is_cont;
+        }
+        if ($do_delete
+            && (($is_cont && $param->{$widget . "|delete_cont$id"})
+                || (!$is_cont && $param->{$widget . "|delete_data$id"}))
+        ) {
             add_msg('Element "[_1]" deleted.', $t->get_name);
             push @delete, $t;
             next;