From 341ffaced5b7b02d2b88090067a071a94183cdf5 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 29 Dec 2015 11:02:07 +1030
Subject: [PATCH] Bypass email activation when admin creates user via API

---
 src/Core/Command/RegisterUserHandler.php | 4 ++++
 src/Core/User.php                        | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index e4a29572b..8daa54e19 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/src/Core/Command/RegisterUserHandler.php
@@ -124,6 +124,10 @@ class RegisterUserHandler
             }
         }
 
+        if ($actor->isAdmin()) {
+            $user->activate();
+        }
+
         $this->events->fire(
             new UserWillBeSaved($user, $actor, $data)
         );
diff --git a/src/Core/User.php b/src/Core/User.php
index 108d250a1..40ad35a0b 100755
--- a/src/Core/User.php
+++ b/src/Core/User.php
@@ -352,9 +352,11 @@ class User extends AbstractModel
      */
     public function activate()
     {
-        $this->is_activated = true;
+        if ($this->is_activated !== true) {
+            $this->is_activated = true;
 
-        $this->raise(new UserWasActivated($this));
+            $this->raise(new UserWasActivated($this));
+        }
 
         return $this;
     }