From 0b6489397a8f5a01c28e61d07548e99ef3e4ff6a Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 13 Aug 2008 18:06:07 +0000 Subject: Reverted changes so users can now register again. There are critical issues with enable/disable. Primarily: 1) A number of functions do not use the access controls, these throw an exception when accessing a disabled entity. 2) #243 does not seem possible. git-svn-id: https://code.elgg.org/elgg/trunk@1909 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/entities.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'engine/lib/entities.php') diff --git a/engine/lib/entities.php b/engine/lib/entities.php index b434f8f7f..5a794024b 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -1485,7 +1485,8 @@ if ($entity->canEdit()) { if ($reason) - $entity->disable_reason = $reason; + create_metadata($guid, 'disable_reason', $reason,'', 0, 2); + //$entity->disable_reason = $reason; $res = update_data("UPDATE {$CONFIG->dbprefix}entities set enabled='no' where guid={$guid}"); @@ -1517,7 +1518,10 @@ access_show_hidden_entities($access_status); - return update_data("UPDATE {$CONFIG->dbprefix}entities set enabled='yes' where guid={$guid}"); + $result = update_data("UPDATE {$CONFIG->dbprefix}entities set enabled='yes' where guid={$guid}"); + $entity->clearMetaData('disable_reason'); + + return $result; } } } -- cgit v1.2.3