diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-09 11:27:58 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-09 11:27:58 +0000 |
| commit | 42b2d6c266866bbfac07c894d7fe3e6480915ee8 (patch) | |
| tree | 645fe72a49f865df81d2b500d24fdf8d24cc88e8 | |
| parent | 15d9fc69cf77f3bd967ce444413b3b8422576e9a (diff) | |
| download | elgg-42b2d6c266866bbfac07c894d7fe3e6480915ee8.tar.gz elgg-42b2d6c266866bbfac07c894d7fe3e6480915ee8.tar.bz2 | |
User validation no longer occurs on first install
git-svn-id: https://code.elgg.org/elgg/trunk@3133 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | actions/register.php | 6 | ||||
| -rw-r--r-- | engine/lib/users.php | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actions/register.php b/actions/register.php index 748c06ce6..fdf2596fc 100644 --- a/actions/register.php +++ b/actions/register.php @@ -49,8 +49,10 @@ $new_user->admin = 'yes'; } - // Send user validation request on register only - request_user_validation($guid); + // Send user validation request on register only
+ global $registering_admin;
+ if (!$registering_admin) + request_user_validation($guid); if (!$new_user->admin) $new_user->disable('new_user'); // Now disable if not an admin diff --git a/engine/lib/users.php b/engine/lib/users.php index 92268858c..630be8d80 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1251,9 +1251,13 @@ }
}
+ global $registering_admin;
if (!$admin) {
$user->admin = true;
datalist_set('admin_registered',1);
+ $registering_admin = true;
+ } else {
+ $registering_admin = false;
}
// Turn on email notifications by default
|