From 7d48b1173f24eeaf6dd70786435af0fc7fbebc18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 22 Mar 2011 21:13:47 +0000
Subject: [PATCH] Set application instance first (to prevent a NPE in
 BaseRegistry)

---
 application/qa/class_ApplicationHelper.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/qa/class_ApplicationHelper.php b/application/qa/class_ApplicationHelper.php
index 2795bbd..41dfb5b 100644
--- 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');
 
-- 
2.39.5