From cc2a4b40bcdd75b6eb729ac14dcb810322c65884 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 23 Feb 2009 09:09:55 +0000
Subject: [PATCH] Changed extension include to be outside function. Didn't work
 in submenus.

---
 CHANGELOG.txt       |  5 +++++
 frontaccounting.php | 11 +++++++++--
 includes/main.inc   | 13 +------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ea6b4981..a5fc9666 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Feb-2009 Joe Hunt
+! Changed extension include to be outside function. Didn't work in submenus.
+$ frontaccounting.php
+  /includes/main.inc
+  
 22-Feb-2009 Janusz Dobrowolski
 ! Application startup code cleanup.
 $ /frontaccounting.php
diff --git a/frontaccounting.php b/frontaccounting.php
index 246d8dc4..3ddfaac0 100644
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -18,6 +18,14 @@
 	include_once($path_to_root . '/applications/generalledger.php');
 	include_once($path_to_root . '/applications/setup.php');
 	include_once($path_to_root . '/installed_extensions.php');
+	if (count($installed_extensions) > 0)
+	{
+		foreach ($installed_extensions as $ext)
+		{
+			include_once($path_to_root."/".$ext['folder']."/".$ext['app_file']);
+		}
+	}	
+
 	include_once($path_to_root . '/modules/installed_modules.php');
 
 	class front_accounting
@@ -65,7 +73,7 @@
 		}
 		function init()
 		{
-			global $installed_extensions, $applications, $path_to_root;
+			global $installed_extensions, $path_to_root;
 			$this->menu = new menu(_("Main  Menu"));
 			$this->menu->add_item(_("Main  Menu"), "index.php");
 			$this->menu->add_item(_("Logout"), "/account/access/logout.php");
@@ -82,7 +90,6 @@
 				{
 					get_text::add_domain($_SESSION['language']->code, 
 						$ext['folder']."/lang");
-					include_once($ext['folder']."/".$ext['app_file']);
 					$class = $ext['name']."_app";
 					$this->add_application(new $class());
 					get_text::add_domain($_SESSION['language']->code, 
diff --git a/includes/main.inc b/includes/main.inc
index b6791b8f..5d4371ba 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -28,21 +28,10 @@ include_once($path_to_root . "/installed_extensions.php");
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false)
 {
 
-   	global $path_to_root, $installed_extensions;
+   	global $path_to_root;
 
    	$hide_menu = $no_menu;
 
-	if ($no_menu==false && count($installed_extensions))
-	{
-		global $applications;
-		foreach ($installed_extensions as $ext)
-		{
-			$s = $applications['system'];
-			array_pop($applications);
-			$applications[$ext['name']] = $ext['title'];;
-			$applications['system'] = $s;
-		}	
-	}	
    	include($path_to_root . "/includes/page/header.inc");
 
    	page_header($title, $no_menu, $is_index, $onload, $js);
-- 
2.30.2