X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLogoutDoneCommand.php;h=603974ccbb284e6669250769a731c6a9558fd3fb;hp=7a7a281d75a66debae7744d59d2168f919913400;hb=2b4f4b88ec5f9d385110e800494c680e164b5a36;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 7a7a281d..603974cc 100644
--- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 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/commands/html/class_HtmlLogoutDoneCommand.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/commands/html/class_HtmlLogoutDoneCommand.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -75,13 +71,13 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable {
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get the application instance
-		$applicationInstance = Registry::getRegistry()->getInstance('app');
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Prepare a template instance
 		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
 		// Assign application data
-		$templateInstance->assignApplicationData($applicationInstance);
+		$templateInstance->assignApplicationData();
 
 		// Load the master template
 		$masterTemplate = $applicationInstance->buildMasterTemplateName();