Merge branch '1.0.x' into testing

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 0d4bc4da16db8f648e1cb1623e46c0999fad28d4..fdb039afec26cc4470ebbf0edd42bd17e654e972 100644 (file)
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -125,28 +125,6 @@ class RequireValidatedEmailPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Event handler for registration attempts; rejects the registration
-     * if email field is missing.
-     *
-     * @param Action $action Action being executed
-     *
-     * @return bool hook result code
-     */
-    function onStartRegistrationTry($action)
-    {
-        $email = $action->trimmed('email');
-
-        if (empty($email)) {
-            $action->showForm(_m('You must provide an email address to register.'));
-            return false;
-        }
-
-        // Default form will run address format validation and reject if bad.
-
-        return true;
-    }
-
     /**
      * Event handler for registration attempts; rejects the registration
      * if email field is missing.