X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fvalidator%2Fclass_UserNameValidatorFilter.php;h=358a759dcb6fd6397af8a0669572332cffb95cd2;hp=dac5153b9c3c5e30927dd13afe381ef1128b57dd;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index dac5153b..358a759d 100644
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Validator\Username;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -118,7 +114,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = Registry::getRegistry();
+		$registry = GenericRegistry::getRegistry();
 
 		// Is the user already there?
 		if ($registry->instanceExists('user')) {