Refs #2629 This should fix this ticket. Need to remove initialise_attributes from...

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

diff --git a/engine/classes/ElggData.php b/engine/classes/ElggData.php
index 2853a5298ee15914e014160463640ac676c39fc3..55d0da810b9bf5c306f573c9da6f0b338f0d4316 100644 (file)
--- 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 a55bbc443d867a9da4b7a0304a85999e8d28fdaf..2a0d6fb288e24c8c325531d1ea86c86746600915 100644 (file)
--- 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 7989acaf4aaa9bd918a41b02de1215e7805e419d..76276181bcf5af7dc47dc8186687a5450690d814 100644 (file)
--- 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 15e942aa3de26790ef949992981de5e3ca15f971..b91fdfeb5ebdfd5a7da2db58f499ac93d5e723f2 100644 (file)
--- 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.
         *