tonyair
/
silverstripe-dms
mirror of https://github.com/silverstripe/silverstripe-dms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.1'

This commit is contained in:
Daniel Hensby 2016-07-15 16:28:22 +01:00
parent 2152199128 d83d71b1ba
commit f46089d158
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.travis.yml
View File

@ -1,24 +1,35 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
language: php
php:
- 5.3
sudo: false
language: php
php:
- 5.3
- 5.4
- 5.5
- 5.6
env:
- DB=MYSQL CORE_RELEASE=3.1
- DB=PGSQL CORE_RELEASE=3
- DB=MYSQL CORE_RELEASE=3.2
matrix:
include:
- php: 5.4
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.4
before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
- composer self-update || true
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
- composer install
script:
- vendor/bin/phpunit dms/tests/
- vendor/bin/phpunit dms/tests

2
code/cms/DMSDocumentAddController.php
View File

@ -175,7 +175,7 @@ class DMSDocumentAddController extends LeftAndMain
public function Backlink()
{
$pageID = $this->currentPageID();
return singleton('CMSPagesController')->Link().'edit/show/'.$pageID;
return Controller::join_links(singleton('CMSPagesController')->Link(), 'edit/show', $pageID);
}
public function documentautocomplete()