Proper error handling even after exit() call.

diff --git a/includes/errors.inc b/includes/errors.inc
index 9616313f433d91e8187d54eacf25d1c0ad45b467..04874a392538a6145ba61e7ea151b5ed43deccea 100644 (file)
--- 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 2afb6e625cb2f62e2002aa67c5b976c8a5a4d39b..2f0481334175c3e29b4104f86ca9ddaaabfb5bbb 100644 (file)
--- 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 9ba28f4964619c4b9ddad36d3e507c7c0046453a..bad4ef65aa9bbfe2fa24085e012d37ab3ab1d31e 100644 (file)
--- 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);
        }