Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / filter / verifier / class_UserNameVerifierFilter.php

diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index c56c8c6fcfd7fa3573caed7cbaec8951ce6996ab..4a02455270c8ff1f39bf2756eddb4c3b534936ba 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 // 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;
 
 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
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0

-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php

  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @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/verifier/class_UserNameVerifierFilter.php

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *


@@ -118,7 +114,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
                $userInstance = NULL;
 
                // Get a registry instance

-               $registry = Registry::getRegistry();
+               $registry = GenericRegistry::getRegistry();

 
                // Is the user already there?
                if ($registry->instanceExists('user')) {
 
                // Is the user already there?
                if ($registry->instanceExists('user')) {