[0000190] Back link on confirmation only pages removed.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 75801b3c9c4ae1e5d10ca374a127fa97871b5f4f..24ebb9b110b3a3a62e9492851519574b3fb4173d 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+15-Jan-2010 Joe Hunt
+# [0000190] Back link on confirmation only pages removed.
+$ /includes/page/footer.inc
+  /includes/ui/ui_view.inc
+  /includes/main.inc
+  
 14-Jan-2010 Joe Hunt
 # A couple of small bugs were fixed in average material cost
 $ /purchasing/includes/db/grn_db.inc

diff --git a/includes/main.inc b/includes/main.inc
index b0878fb5004450b941b39fe611ad9fa81b2ef3d9..138ae369a53eca55ad3cb3fd76ffbf73bcff3f96 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -48,13 +48,13 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
        }
 }
 
-function end_page($no_menu=false, $is_index=false)
+function end_page($no_menu=false, $is_index=false, $hide_back_link=false)
 {
        global $path_to_root, $Ajax;
        $hide_menu = $no_menu;
                div_end();      // _page_body section
        include($path_to_root . "/includes/page/footer.inc");
-       page_footer($no_menu, $is_index);
+       page_footer($no_menu, $is_index, $hide_back_link);
 }
 
 function flush_dir($path, $wipe = false) 

diff --git a/includes/page/footer.inc b/includes/page/footer.inc
index 90c951c19bb46e60327b4bf3c8ac5831056c93b1..e07f69838a5b900b126c5fc739b37eae7c9cae48 100644 (file)
--- a/includes/page/footer.inc
+++ b/includes/page/footer.inc
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function page_footer($no_menu=false, $is_index=false)
+function page_footer($no_menu=false, $is_index=false, $hide_back_link=false)
 {
        global $path_to_root, $js_lib, $Validate, $Editors, $Ajax;
 
-       if (!$is_index && function_exists('hyperlink_back'))
+       if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
                hyperlink_back();
        include_once($path_to_root."/themes/".user_theme()."/renderer.php");
        $rend = new renderer();

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 8c6bf63bcad55fdbd02f5ae9202cdc112076d8ad..039a9b795b8169c7da5c48f7c91ac937a728f460 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -432,7 +432,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 function display_footer_exit()
 {
        br(2);
-       end_page();
+       end_page(false, false, true);
        exit;
 }