'public static final' is correct

[admin.git] / application / admin / class_ApplicationHelper.php

diff --git a/application/admin/class_ApplicationHelper.php b/application/admin/class_ApplicationHelper.php
index be71d0a9c494a3517625d60e464ce19a4447d402..3b1e01eea951c178c0531cf23b4de7d199d2b92b 100644 (file)
--- a/application/admin/class_ApplicationHelper.php
+++ b/application/admin/class_ApplicationHelper.php
@@ -80,7 +80,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         *
         * @return      $thisInstance           An instance of this class
         */
-       public final static function getInstance () {
+       public static final function getInstance () {
                // Is the instance there?
                if (is_null(self::$thisInstance)) {
                        self::$thisInstance = new ApplicationHelper();
@@ -205,7 +205,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                        $commandName = $responseInstance->getDefaultCommand();
 
                        // Set it in request
-                       $requestInstance->setRequestElement('page', $command);
+                       $requestInstance->setRequestElement('page', $commandName);
                } // END - if
 
                // Get a resolver
@@ -216,7 +216,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                $this->controllerInstance = $resolverInstance->resolveController();
 
                // Get a web output class
-               $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class');
+               $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this));
 
                // Set it in this application
                $this->setWebOutputInstance($outputInstance);