X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlConfirmCommand.php;h=5be6195f7c27b31ed04e7ba9e102a8917dc35271;hp=689ece383cf68bf0f591c5c6a95355aea6b0dd4e;hb=2b4f4b88ec5f9d385110e800494c680e164b5a36;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
index 689ece38..5be6195f 100644
--- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -9,7 +9,7 @@ use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
-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;
@@ -19,11 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlConfirmCommand.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_HtmlConfirmCommand.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -77,13 +73,13 @@ class HtmlConfirmCommand 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 with template engine
-		$templateInstance->assignApplicationData($applicationInstance);
+		$templateInstance->assignApplicationData();
 
 		// Assign base URL
 		$templateInstance->assignConfigVariable('base_url');
@@ -119,7 +115,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable {
 
 		// Get user instance
 		try {
-			$userInstance = Registry::getRegistry()->getInstance('user');
+			$userInstance = GenericRegistry::getRegistry()->getInstance('user');
 		} catch (NullPointerException $e) {
 			// Not found user, e.g. when the user is somehow invalid
 			$responseInstance->redirectToConfiguredUrl('html_cmd_user_is_null');