aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2013-06-01 22:13:08 -0400
committerSteve Clay <steve@mrclay.org>2013-06-01 22:13:08 -0400
commit50dee6fe09a1f600089b1684f6f8f91599c365a1 (patch)
treecdcb52b33e7682dae6c13a194e3d35a6a9f95e62
parentb2af2df3b5c89869e83ce5ee66d8368b3addef35 (diff)
downloadelgg-50dee6fe09a1f600089b1684f6f8f91599c365a1.tar.gz
elgg-50dee6fe09a1f600089b1684f6f8f91599c365a1.tar.bz2
Refs #5538: Adds missing attributes to ElggUser and ElggCoreUserTest (by Paweł Sroka)
-rw-r--r--engine/classes/ElggUser.php3
-rw-r--r--engine/tests/objects/users.php3
2 files changed, 6 insertions, 0 deletions
diff --git a/engine/classes/ElggUser.php b/engine/classes/ElggUser.php
index 6d9f10b57..b2cada8ef 100644
--- a/engine/classes/ElggUser.php
+++ b/engine/classes/ElggUser.php
@@ -40,6 +40,9 @@ class ElggUser extends ElggEntity
$this->attributes['code'] = NULL;
$this->attributes['banned'] = "no";
$this->attributes['admin'] = 'no';
+ $this->attributes['prev_last_action'] = NULL;
+ $this->attributes['last_login'] = NULL;
+ $this->attributes['prev_last_login'] = NULL;
$this->attributes['tables_split'] = 2;
}
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
index a3573acb6..dc9129326 100644
--- a/engine/tests/objects/users.php
+++ b/engine/tests/objects/users.php
@@ -65,6 +65,9 @@ class ElggCoreUserTest extends ElggCoreUnitTest {
$attributes['code'] = NULL;
$attributes['banned'] = 'no';
$attributes['admin'] = 'no';
+ $attributes['prev_last_action'] = NULL;
+ $attributes['last_login'] = NULL;
+ $attributes['prev_last_login'] = NULL;
ksort($attributes);
$entity_attributes = $this->user->expose_attributes();