Merge branch '1.0'

This commit is contained in:
Daniel Hensby 2016-03-18 11:51:28 +00:00
commit cbd48d46a1
2 changed files with 6 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
language: php
php:
language: php
php:
- 5.3
sudo: false
@ -20,5 +20,5 @@ before_script:
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
script:
- phpunit dms/tests/
script:
- vendor/bin/phpunit dms/tests/

View File

@ -985,7 +985,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
'<li class="ss-ui-button" data-panel="find-usage">Usage</li>'.
'<li class="ss-ui-button" data-panel="find-references">References</li>'.
$extraTasks.
'</ul></div>'));
'</ul></div>'
));
$embargoValue = 'None';
if ($this->EmbargoedIndefinitely) {