Continued:

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

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 97eb61dfdfe2b0d73a4b20cbf45b1b6400132893..e42a47480f571a96fd29687fcd89639be2b1095a 100644 (file)
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -117,12 +117,12 @@ class UserNameValidatorFilter 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->setUserName($userName);
                } else {
                        // If this instance is created then the username *does* exist
@@ -131,7 +131,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
                                $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByUsername'), array($userName));
 
                                // Remember this user instance in our registry for later usage
-                               $registry->addInstance('user', $userInstance);
+                               $registryInstance->addInstance('user', $userInstance);
                        } catch (UsernameMissingException $e) {
                                // User was not found
                        }