From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Fri, 15 Jan 2010 09:37:56 +0000 (+0000)
Subject: [0000190] Back link on confirmation only pages removed.
X-Git-Tag: 2.3-final~1039
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4247980002820396888c3b6bcbd18617fbd196ef;p=fa-stable.git

[0000190] Back link on confirmation only pages removed.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 75801b3c..24ebb9b1 100644
--- 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 b0878fb5..138ae369 100644
--- 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 90c951c1..e07f6983 100644
--- 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 8c6bf63b..039a9b79 100644
--- 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;
 }