Fixes #1049, Fixes #1435: Admin-created users and first admin user are marked as...

git-svn-id: http://code.elgg.org/elgg/trunk@3851 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/useradd.php b/actions/useradd.php
index 71b8d826d637a7bd64f25324bafb7dcfdbfd88fe..ea0bc66e036ebf01f6cd81153cf48f70d3550252 100644 (file)
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -36,6 +36,7 @@ try {
 
                $new_user->admin_created = true;
                $new_user->created_by_guid = get_loggedin_userid();
+               set_user_validation_status($new_user->getGUID(), TRUE, 'admin_created');
 
                notify_user($new_user->guid, $CONFIG->site->guid, elgg_echo('useradd:subject'), sprintf(elgg_echo('useradd:body'), $name, $CONFIG->site->name, $CONFIG->site->url, $username, $password));
 

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 512b8a6e6a13086152f55cfad2fa2b14391e1cba..0171e838dfe84988823149f4ea491036e2c7a677 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1298,7 +1298,7 @@ function register_user($username, $password, $name, $email, $allow_multiple_emai
        global $registering_admin;
        if (!$have_admin) {
                $user->admin = true;
-               $user->validated = 'admin';
+               set_user_validation_status($user->getGUID(), TRUE, 'first_run');
                datalist_set('admin_registered', 1);
                $registering_admin = true;
        } else {