Some updates:

[core.git] / framework / main / classes / commands / image / class_ImageCodeCaptchaCommand.php

diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
index a0e329df7a29311a2cd4ce7ab8b355b3b1e4f390..ef36945cc149e092ac9d0dd9076da4cb7f1d3ee0 100644 (file)
--- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
+++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
@@ -1,21 +1,26 @@
 <?php
 // Own namespace
-namespace CoreFramework\Command\Captcha;
+namespace Org\Mxchange\CoreFramework\Command\Captcha;
 
 // Import framework stuff
-use CoreFramework\Command\BaseCommand;
-use CoreFramework\Command\Commandable;
-use CoreFramework\Controller\Controller;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Command\CommandResolver;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Command\BaseCommand;
+use Org\Mxchange\CoreFramework\Command\Commandable;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A command for creating code CAPTCHAs
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.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/image/class_ImageCodeCaptchaCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -72,7 +77,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable {
                $decryptedCode = $requestInstance->getRequestElement('decrypted');
 
                // Get the application instance
-               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = Registry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);