From 768ffdfb4b96eab50787c3582fa0d622dcab2b7b Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Tue, 1 Nov 2016 17:22:45 +0000 Subject: [PATCH] Amend path addition (#952) --- application/controllers/Customers.php | 5 ++--- application/controllers/Items.php | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php index f4f310500..19296dd0a 100644 --- a/application/controllers/Customers.php +++ b/application/controllers/Customers.php @@ -153,13 +153,12 @@ class Customers extends Persons } /* - Customer import from excel spreadsheet + Customers import from excel spreadsheet */ public function excel() { $name = 'import_customers.csv'; - $dir = '..'; - $data = file_get_contents($dir . '/' . $name); + $data = file_get_contents('../' . $name); force_download($name, $data); } diff --git a/application/controllers/Items.php b/application/controllers/Items.php index 47d4c059f..e31954b32 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -560,12 +560,14 @@ class Items extends Secure_Controller echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_cannot_be_deleted'))); } } - + + /* + Items import from excel spreadsheet + */ public function excel() { $name = 'import_items.csv'; - $dir = '..'; - $data = file_get_contents($dir . '/' . $name); + $data = file_get_contents('../' . $name); force_download($name, $data); }