finished the conversion to initializeAttributes()

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

diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
index bf6732ca4fd4ec3d8ece15d802d05f8eaf943525..46cd0b6a0ddffca7fa4911678443fa5e6e0dbca7 100644 (file)
--- a/engine/classes/ElggFile.php
+++ b/engine/classes/ElggFile.php
@@ -36,6 +36,7 @@ class ElggFile extends ElggObject {
         */
        protected function initialise_attributes() {
                elgg_deprecated_notice('ElggFile::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
+               $this->initializeAttributes();
        }
 
        /**

diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index b6b1b9b59c5c2a7a57f4ec9221ec2244e977a6fc..e147c0a3cc994aa3f118b91875131ec1f0b0fea6 100644 (file)
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -227,7 +227,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 // ElggEntity is an abstract class with no abstact methods.
 class ElggEntityTest extends ElggEntity {
        public function __construct() {
-               $this->initialise_attributes();
+               $this->initializeAttributes();
        }
 
        public function expose_attributes() {

diff --git a/mod/blog/classes/ElggBlog.php b/mod/blog/classes/ElggBlog.php
index 8dfe0585cb23cdd6788f31be18c84c04b9aaf235..7a64a17772321adb4354d36e899e3d57c021a9c1 100644 (file)
--- a/mod/blog/classes/ElggBlog.php
+++ b/mod/blog/classes/ElggBlog.php
@@ -3,11 +3,14 @@
  * Extended class to override the time_created
  */
 class ElggBlog extends ElggObject {
-       protected function initialise_attributes() {
-               parent::initialise_attributes();
 
-               // override the default file subtype.
-               $this->attributes['subtype'] = 'blog';
+       /**
+        * Set subtype to blog.
+        */
+       protected function initializeAttributes() {
+               parent::initializeAttributes();
+
+               $this->attributes['subtype'] = "blog";
        }
 
        /**