aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/classes/ElggData.php1
-rw-r--r--engine/classes/ElggFile.php12
-rw-r--r--engine/classes/ElggPlugin.php12
-rw-r--r--engine/classes/ElggWidget.php13
4 files changed, 1 insertions, 37 deletions
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
@@ -31,18 +31,6 @@ class ElggFile extends ElggObject {
* 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'.
- *
- * @return void
*/
protected function initializeAttributes() {
parent::initializeAttributes();
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
@@ -14,18 +14,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'
- *
- * @return void
*/
protected function initializeAttributes() {
parent::initializeAttributes();
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
@@ -13,19 +13,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.
- *
* @return void
*/
protected function initializeAttributes() {