Continued:

[core.git] / framework / main / classes / filter / validator / class_EmailValidatorFilter.php

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index 8d1d827c93114bfc57aedea2c353acd2630752b1..44da75c394aee525e94c2044113c9cf29520aadd 100644 (file)
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -124,7 +124,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
                                // Abort here
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-                       } // END - elseif
+                       }
                } elseif (empty($email)) {
                        // Empty field!
                        $requestInstance->requestIsValid(false);
@@ -134,7 +134,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - elseif
+               }
        }
 
        /**
@@ -151,19 +151,19 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Is the user already there?
-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {
                        // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
+                       $userInstance = $registryInstance->getInstance('user');
                        $userInstance->setEmailAddress($email);
                } else {
                        // If this instance is created then the username *does* exist
                        $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByEmail'), array($email));
 
                        // Remember this user instance in our registry for later usage
-                       $registry->addInstance('user', $userInstance);
+                       $registryInstance->addInstance('user', $userInstance);
                }
 
                // Does the email exist?