Fixes #2629: Pulled old initialise_attributes() into ElggData and added a default param to emit a deprecation notice if called.

git-svn-id: http://code.elgg.org/elgg/trunk@7387 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 3 insertions, 13 deletions

diff --git a/engine/classes/ElggGroup.php b/engine/classes/ElggGroup.php
index 448c1f7a6..81c1db138 100644
--- a/engine/classes/ElggGroup.php
+++ b/engine/classes/ElggGroup.php
@@ -9,7 +9,6 @@
 class ElggGroup extends ElggEntity
 	implements Friendable {
 
-
 	/**
 	 * Sets the type to group.
 	 *
@@ -17,18 +16,6 @@ class ElggGroup extends ElggEntity
 	 *
 	 * @deprecated 1.8 Use initializeAttributes
 	 */
-	protected function initialise_attributes() {
-		elgg_deprecated_notice('ElggGroup::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
-		return $this->initializeAttributes();
-	}
-
-	/**
-	 * Sets the type to group.
-	 *
-	 * @return void
-	 *
-	 * @see ElggEntity::initialise_attributes()
-	 */
 	protected function initializeAttributes() {
 		parent::initializeAttributes();
 
@@ -49,6 +36,9 @@ class ElggGroup extends ElggEntity
 	function __construct($guid = null) {
 		$this->initializeAttributes();
 
+		// compatibility for 1.7 api.
+		$this->initialise_attributes(false);
+
 		if (!empty($guid)) {
 			// Is $guid is a DB row - either a entity row, or a user table row.
 			if ($guid instanceof stdClass) {