X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fchange%2Fclass_PasswordChangeFilter.php;fp=framework%2Fmain%2Fclasses%2Ffilter%2Fchange%2Fclass_PasswordChangeFilter.php;h=1a7ecdaab5648eb6bcc643647f8badddd8b7eef7;hp=ce6a1c463742548d1ca84c8134feed2f3ff13a0c;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
index ce6a1c46..1a7ecdaa 100644
--- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\Password;
 // 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;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/change/class_PasswordChangeFilter.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/change/class_PasswordChangeFilter.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -117,7 +113,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 		} // END - if
 
 		// Now, get a user instance for comparison
-		$userInstance = Registry::getRegistry()->getInstance('user');
+		$userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
 		// Update the "password" field
 		$this->partialStub('Unfinished part.');