From 9a2baf28c28edc0745f70f758ed9a1335dd87f07 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 20 Jun 2008 07:48:57 +0000
Subject: [PATCH] Proper error handling even after exit() call.

---
 includes/errors.inc  | 3 +--
 includes/main.inc    | 1 -
 includes/session.inc | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/includes/errors.inc b/includes/errors.inc
index 9616313f..04874a39 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -101,8 +101,7 @@ function frindly_db_error($db_error)
 	
 	if ($db_error == $db_duplicate_error_code) 
 	{
-		display_error(_("The entered information is a duplicate. Please go back and enter different values.")
-		. "<br><a href='javascript:history.go(-1)'>" . _("Back") . "</a>", true);
+		display_error(_("The entered information is a duplicate. Please go back and enter different values."));
 		return true;
 	}
 	
diff --git a/includes/main.inc b/includes/main.inc
index 2afb6e62..2f048133 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -38,7 +38,6 @@
 		div_end();	// _page_body section
     	include($path_to_root . "/includes/page/footer.inc");
 
-	$Ajax->run();
     	page_footer($no_menu, $is_index);
     }
 
diff --git a/includes/session.inc b/includes/session.inc
index 9ba28f49..bad4ef65 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -11,7 +11,8 @@
 
 	function output_html($text)
 	{
-  	  global $before_box;
+  	  global $before_box, $Ajax;
+	  $Ajax->run();
   	  return  in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text);
 	}
 
-- 
2.30.2