From 11bc05de9692c91a90c73eaec6239ed46d286c67 Mon Sep 17 00:00:00 2001 From: Chris Lock Date: Tue, 13 Dec 2016 14:28:57 +0000 Subject: [PATCH 1/3] Altering error message to show the exception --- dev/CsvBulkLoader.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/CsvBulkLoader.php b/dev/CsvBulkLoader.php index dcbdd3b81..616b2019a 100644 --- a/dev/CsvBulkLoader.php +++ b/dev/CsvBulkLoader.php @@ -81,7 +81,11 @@ class CsvBulkLoader extends BulkLoader { @unlink($file); } } catch (Exception $e) { - print "Failed to parse {$last}\n"; + $failedMessage = sprintf("Failed to parse %s", $last); + if (Director::isDev()) { + $failedMessage = sprintf($failedMessage . " because %s", $e->getMessage()); + } + print $failedMessage . PHP_EOL; } return $result; From b05930356dc4b0a44e65f3f7fdfc5d4a07af88eb Mon Sep 17 00:00:00 2001 From: 3Dgoo Date: Mon, 23 Jan 2017 09:27:15 +1030 Subject: [PATCH 2/3] Updating help link to 3.5 from 3.3 --- admin/code/LeftAndMain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 4e8a6c3b3..7e084d61b 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -79,7 +79,7 @@ class LeftAndMain extends Controller implements PermissionProvider { * @config * @var string */ - private static $help_link = '//userhelp.silverstripe.org/framework/en/3.3'; + private static $help_link = '//userhelp.silverstripe.org/framework/en/3.5'; /** * @var array From 08fbb451d35c3a87e64e505ba911bde94021be60 Mon Sep 17 00:00:00 2001 From: 3Dgoo Date: Mon, 23 Jan 2017 09:53:49 +1030 Subject: [PATCH 3/3] Updating help link to 3.4 from 3.3 --- admin/code/LeftAndMain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index aae24522d..31385675b 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -79,7 +79,7 @@ class LeftAndMain extends Controller implements PermissionProvider { * @config * @var string */ - private static $help_link = '//userhelp.silverstripe.org/framework/en/3.3'; + private static $help_link = '//userhelp.silverstripe.org/framework/en/3.4'; /** * @var array