From 20a783f75445c8889335b8a51cf5723b3b19cdb2 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 9 Nov 2009 11:00:04 +0000 Subject: [PATCH] Fixed help link generation to clean page context string. --- CHANGELOG.txt | 9 +++++++++ includes/page/header.inc | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 810cc8f7..f008ff57 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +09-Nov-2009 Janusz Dobrowolski +! Fixed help link to provide ctxhelp switch and clean the page context string. +$ /includes/page/header.inc + 08-Nov-2009 Joe Hunt # Bug in adding freight cost to sales order/quotation $ /sales/inquiry/sales_orders_view.php @@ -39,6 +43,10 @@ $ /sales/inquiry/sales_orders_view.php ! More improvements on layout display. $ /purchases/includes/ui/po_ui.inc /inventory/includes/item_adjustments_ui.inc + +06-Nov-2009 Janusz Dobrowolski +# Include sequence fixed. +$ /admin/tags.php 06-Nov-2009 Joe Hunt ! Improved layout in the new tax info display. Also old ones. @@ -48,6 +56,7 @@ $ /sales/credit_invoice.php /sales/includes/ui/sales_credit_ui.inc /sales/includes/ui/sales_order_ui.inc +>>>>>>> 1.39.2.516 05-Nov-2009 Joe Hunt ! Display tax info in Sales Quotation, Order, Direct Delivery and Invoice. $ /sales/includes/ui/sales_order_ui.inc diff --git a/includes/page/header.inc b/includes/page/header.inc index bb8fbd31..9bff3d2f 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -40,7 +40,9 @@ function help_url($context=null) if ($clean) $help_page_url = access_string($help_page_url, true); - return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url))).'&lang='.$country; + return $help_base_url + .urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And'))) + .'&ctxhelp=1&lang='.$country; } function send_scripts() -- 2.30.2