Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / RequireValidatedEmail / RequireValidatedEmailPlugin.php

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index b6bd6f7e5fbeae4bc8c47ca44e22652c2e8fd181..fdb039afec26cc4470ebbf0edd42bd17e654e972 100644 (file)
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -133,17 +133,15 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return bool hook result code
      */
-    function onStartRegistrationTry($action)
+
+    function onStartRegisterUser(&$user, &$profile)
     {
-        $email = $action->trimmed('email');
+        $email = $user->email;
 
         if (empty($email)) {
-            $action->showForm(_m('You must provide an email address to register.'));
-            return false;
+            throw new ClientException(_m('You must provide an email address to register.'));
         }
 
-        // Default form will run address format validation and reject if bad.
-
         return true;
     }