aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/admin.php1
-rw-r--r--engine/lib/entities.php14
2 files changed, 15 insertions, 0 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index e8ec019ac..52bf3e1f1 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -46,6 +46,7 @@
extend_elgg_admin_page('admin/main_opt/plugins', 'admin/main', 999); // Always last
register_action('admin/user/ban', false, "", true);
+ register_action('admin/user/unban', false, "", true);
register_action('admin/user/delete', false, "", true);
register_action('admin/user/resetpassword', false, "", true);
register_action('admin/user/makeadmin', false, "", true);
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 31129fbad..771627b89 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -86,6 +86,7 @@
$this->attributes['access_id'] = 0;
$this->attributes['time_created'] = "";
$this->attributes['time_updated'] = "";
+ $this->attributes['enabled'] = "";
// There now follows a bit of a hack
/* Problem: To speed things up, some objects are split over several tables, this means that it requires
@@ -674,6 +675,19 @@
}
/**
+ * Is this entity enabled?
+ *
+ * @return boolean
+ */
+ public function isEnabled()
+ {
+ if ($this->enabled)
+ return true;
+
+ return false;
+ }
+
+ /**
* Delete this entity.
*/
public function delete()