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 diff --git a/dev/CsvBulkLoader.php b/dev/CsvBulkLoader.php index db8d8e5e8..97e9ef56a 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;