From d9d5e669dc2f336cd110dd3761573165e46c6f0c Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 20 Nov 2010 20:06:08 +0000
Subject: Refs #2629 This should fix this ticket. Need to remove
 initialise_attributes from any class updated with new method and add call to
 initializeAttributes in ElggData for those that are not updated.

git-svn-id: http://code.elgg.org/elgg/trunk@7389 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggData.php   |  1 +
 engine/classes/ElggFile.php   | 12 ------------
 engine/classes/ElggPlugin.php | 12 ------------
 engine/classes/ElggWidget.php | 13 -------------
 4 files changed, 1 insertion(+), 37 deletions(-)

(limited to 'engine/classes')

diff --git a/engine/classes/ElggData.php b/engine/classes/ElggData.php
index 2853a5298..55d0da810 100644
--- a/engine/classes/ElggData.php
+++ b/engine/classes/ElggData.php
@@ -39,6 +39,7 @@ abstract class ElggData implements
 	protected function initialise_attributes($pre18_api = true) {
 		if ($pre18_api) {
 			elgg_deprecated_notice('initialise_attributes() is deprecated by initializeAttributes()', 1.8);
+			initializeAttributes();
 		} else {
 			return false;
 		}
diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
index a55bbc443..2a0d6fb28 100644
--- a/engine/classes/ElggFile.php
+++ b/engine/classes/ElggFile.php
@@ -27,18 +27,6 @@ class ElggFile extends ElggObject {
 	/** File handle used to identify this file in a filestore. Created by open. */
 	private $handle;
 
-	/**
-	 * Set subtype to 'file'.
-	 *
-	 * @return void
-	 *
-	 * @deprecated 1.8 Use initializeAttributes()
-	 */
-	protected function initialise_attributes() {
-		elgg_deprecated_notice('ElggFile::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
-		$this->initializeAttributes();
-	}
-
 	/**
 	 * Set subtype to 'file'.
 	 *
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 7989acaf4..76276181b 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -10,18 +10,6 @@
  */
 class ElggPlugin extends ElggObject {
 
-	/**
-	 * Set subtype to 'plugin'
-	 *
-	 * @return void
-	 * 
-	 * @deprecated 1.8 Use initializeAttributes()
-	 */
-	protected function initialise_attributes() {
-		elgg_deprecated_notice('ElggPlugin::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
-		return $this->initializeAttributes();
-	}
-
 	/**
 	 * Set subtype to 'plugin'
 	 *
diff --git a/engine/classes/ElggWidget.php b/engine/classes/ElggWidget.php
index 15e942aa3..b91fdfeb5 100644
--- a/engine/classes/ElggWidget.php
+++ b/engine/classes/ElggWidget.php
@@ -10,19 +10,6 @@
  */
 class ElggWidget extends ElggObject {
 
-	/**
-	 * Set subtype to widget.
-	 *
-	 * @deprecated 1.8 use ElggWidget::initializeAttributes()
-	 *
-	 * @return void
-	 */
-	protected function initialise_attributes() {
-		elgg_deprecated_notice('ElggWidget::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
-
-		return $this->initializeAttributes();
-	}
-
 	/**
 	 * Set subtype to widget.
 	 *
-- 
cgit v1.2.3