Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git] / framework / main / classes / filter / validator / class_EmailValidatorFilter.php
index 8e6fcf592ac09b5bb14327893efb51f73e584e93..d609d86573c4a2c15700dac7a0534e00c62da0fa 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Validator\Email;
 // 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;
 
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_EmailValidatorFilter.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_EmailValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -153,7 +149,7 @@ class EmailValidatorFilter 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')) {