aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:14:00 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:14:00 +0000
commit323e3ee1dafdf7bdd60607fd960e53957fce770d (patch)
tree4d98811a53afef9e10d4b08fd3084368559b4999
parent1e8b0564c84537c9d82d8e0c645e162bf0e1fc0e (diff)
downloadelgg-323e3ee1dafdf7bdd60607fd960e53957fce770d.tar.gz
elgg-323e3ee1dafdf7bdd60607fd960e53957fce770d.tar.bz2
finished the conversion to initializeAttributes()
git-svn-id: http://code.elgg.org/elgg/trunk@7145 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/classes/ElggFile.php1
-rw-r--r--engine/tests/objects/entities.php2
-rw-r--r--mod/blog/classes/ElggBlog.php11
3 files changed, 9 insertions, 5 deletions
diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
index bf6732ca4..46cd0b6a0 100644
--- 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 b6b1b9b59..e147c0a3c 100644
--- 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 8dfe0585c..7a64a1777 100644
--- 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";
}
/**