Fixed help link generation to clean page context string.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 810cc8f7db986382bbc15459051c06e66541599a..f008ff57bf7328ac8ca6226f5f4dd721349b7733 100644 (file)
--- 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 bb8fbd3102c07f94789ec95fae215d906f3be766..9bff3d2f391710be748f72f5b3e34a86c18eb367 100644 (file)
--- 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()