Set application instance first (to prevent a NPE in BaseRegistry)

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

diff --git a/application/qa/class_ApplicationHelper.php b/application/qa/class_ApplicationHelper.php
index 2795bbdbafd6ceae7af8b58cc5c0ef0ce0598aaf..41dfb5bc2092a776d1dd2ba92d70bbddd93fe56a 100644 (file)
--- a/application/qa/class_ApplicationHelper.php
+++ b/application/qa/class_ApplicationHelper.php
@@ -84,7 +84,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                // Is the instance there?
                if (is_null(self::$thisInstance)) {
                        self::$thisInstance = new ApplicationHelper();
-               }
+               } // END - if
 
                // Return the instance
                return self::$thisInstance;
@@ -172,6 +172,9 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         * @return      void
         */
        public final function entryPoint () {
+               // Set this application in registry
+               Registry::getRegistry()->addInstance('app', $this);
+
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');