Fixed php 5.3 function name conflict.

diff --git a/includes/main.inc b/includes/main.inc
index f01bcddcd30dc4f97a502a3942d2663a40c65b2f..23a3822791510cafa5e012b86798a727a2f091cf 100644 (file)
--- 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 9ec7cc313a2b2e8f9a4e98d011f7873bcff60ab2..abd11a00a9dd34bafca000e4bf541f4a63ada10d 100644 (file)
--- 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'))
        );