aboutsummaryrefslogtreecommitdiff
path: root/engine/classes/ElggUser.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-20 17:41:50 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-20 17:41:50 +0000
commitfaf079af4ddc0f35fc2b5835c20f184b4c93e303 (patch)
tree8909cfa7f9a221ff17dacc451b80f6f706e54dad /engine/classes/ElggUser.php
parent9abd6ad3de13d4a5a6c6f00a216d6310d6df4cc0 (diff)
downloadelgg-faf079af4ddc0f35fc2b5835c20f184b4c93e303.tar.gz
elgg-faf079af4ddc0f35fc2b5835c20f184b4c93e303.tar.bz2
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
Diffstat (limited to 'engine/classes/ElggUser.php')
-rw-r--r--engine/classes/ElggUser.php20
1 files changed, 4 insertions, 16 deletions
diff --git a/engine/classes/ElggUser.php b/engine/classes/ElggUser.php
index ab1bd71a0..071806529 100644
--- a/engine/classes/ElggUser.php
+++ b/engine/classes/ElggUser.php
@@ -9,23 +9,8 @@
*/
class ElggUser extends ElggEntity
implements Friendable {
- /**
- * Initialise the attributes array.
- * This is vital to distinguish between metadata and base parameters.
- *
- * Place your base parameters here.
- *
- * @deprecated 1.8 Use ElggUser::initializeAttributes()
- *
- * @return void
- */
- protected function initialise_attributes() {
- elgg_deprecated_notice('ElggUser::initialise_attributes() is deprecated by ::initializeAttributes()', 1.8);
-
- return $this->initializeAttributes();
- }
- /**
+ /**
* Initialise the attributes array.
* This is vital to distinguish between metadata and base parameters.
*
@@ -60,6 +45,9 @@ class ElggUser 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) {