API CHANGE: Remove dodgy DataObject::destroy() behaviour, opting inst…

…ead for using PHP5.3's garbage collector.
silverstripe · Jun 11, 2012 · f65a7c6 · f65a7c6
1 parent e96ca5f
commit f65a7c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/core/Core.php b/core/Core.php
@@ -207,6 +207,11 @@
 mb_internal_encoding('UTF-8');
 mb_regex_encoding('UTF-8');
 
+/**
+ * Enable better garbage collection
+ */
+gc_enable();
+
 ///////////////////////////////////////////////////////////////////////////////
 // INCLUDES
 

diff --git a/model/DataObject.php b/model/DataObject.php
@@ -408,12 +408,8 @@ function setDataModel(DataModel $model) {
 	 * You'll need to call this to get the memory of an object that has components or extensions freed.
 	 */
 	function destroy() {
-		$this->extension_instances = null;
-		$this->components = null;
-		$this->destroyed = true;
-		$this->record = null;
-		$this->original = null;
-		$this->changed = null;
+		//$this->destroyed = true;
+		gc_collect_cycles();
 		$this->flushCache(false);
 	}