tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 13:19:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-01-23 16:25:14 +00:00
commit de8b5d6623
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/LeftAndMain.php
View File

@ -79,7 +79,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
* @config * @config
* @var string * @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 * @var array

6
dev/CsvBulkLoader.php
View File

@ -81,7 +81,11 @@ class CsvBulkLoader extends BulkLoader {
@unlink($file); @unlink($file);
} }
} catch (Exception $e) { } 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; return $result;