Changeset 17910

Timestamp:

10/03/08 19:39:20 (2 months ago)

Author:

rambo

Message:

forward port r17909

Files:

• trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php (modified) (4 diffs)

trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

@@ -703 +703 @@
-                {
-                    $undeleted = true;
+                    // refresh
+                    $object = $_MIDCOM->dbfactory->get_object_by_guid($guid);
-                }
-            }
@@ -710 +712 @@
-                {
-                    $undeleted = true;
+                    // refresh
+                    $object = $_MIDCOM->dbfactory->get_object_by_guid($guid);
-                }
-            }
@@ -718 +722 @@
-                debug_pop();
-            }
+            else
+            {
+                $parent = $object->get_parent();
+                if (   $parent
+                    && $parent->guid)
+                {
+                    // Invalidate parent from cache so content caches have chance to react
+                    $_MIDCOM->cache->invalidate($parent->guid);
+                }
+                
+                // Invalidate Midgard pagecache if we touched style/page element
+                if (   function_exists('mgd_cache_invalidate')
+                    && (   is_a($object, 'midgard_element')
+                        || is_a($object, 'midgard_pageelement'))
+                    )
+                {
+                    mgd_cache_invalidate();
+                }
+            }
-            $stats[$guid] = $undeleted;
-
+
-            // FIXME: We should only undelete parameters & attachments deleted inside some small window of the main objects delete
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -730 +753 @@
-            midcom_baseclasses_core_dbobject::undelete_attachments($guid);
-
+            //FIXME: are we sure we want to undelete all children here unconditionally, shouldn't it be left as UI decision ??
-            // List all deleted children
-            $children_types = $ref->get_child_objects($object, true);