From 76addbf42e148553411cf37bf1284d2cf6082b84 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 10 Oct 2009 12:25:03 +0000 Subject: [PATCH] Fixed php 5.3 function name conflict. --- includes/main.inc | 2 +- sales/inquiry/sales_orders_view.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/main.inc b/includes/main.inc index f01bcddc..23a38227 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -276,7 +276,7 @@ function array_remove(&$array, $index, $len=1) array_splice($array, $index, $len); } -function array_replace(&$array, $index, $len, $elements) +function array_substitute(&$array, $index, $len, $elements) { array_splice($array, $index, $len); array_insert($array, $index, $elements); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index 9ec7cc31..abd11a00 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -333,15 +333,15 @@ else _("Currency") => array('align'=>'center') ); if ($_POST['order_view_mode'] == 'OutstandingOnly') { - //array_replace($cols, 3, 1, _("Cust Order Ref")); + //array_substitute($cols, 3, 1, _("Cust Order Ref")); array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link'))); } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') { - array_replace($cols, 3, 1, _("Description")); + array_substitute($cols, 3, 1, _("Description")); array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link'))); } else if ($_POST['order_view_mode'] == 'DeliveryTemplates') { - array_replace($cols, 3, 1, _("Description")); + array_substitute($cols, 3, 1, _("Description")); array_append($cols, array( array('insert'=>true, 'fun'=>'delivery_link')) ); -- 2.30.2