mirror of
https://github.com/silverstripe/silverstripe-dms
synced 2024-10-22 14:05:56 +02:00
Merge branch '1.1'
This commit is contained in:
commit
f46089d158
33
.travis.yml
33
.travis.yml
@ -1,24 +1,35 @@
|
|||||||
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
|
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
|
||||||
|
|
||||||
language: php
|
|
||||||
php:
|
|
||||||
- 5.3
|
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
|
language: php
|
||||||
|
|
||||||
|
php:
|
||||||
|
- 5.3
|
||||||
|
- 5.4
|
||||||
|
- 5.5
|
||||||
|
- 5.6
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- DB=MYSQL CORE_RELEASE=3.1
|
- DB=MYSQL CORE_RELEASE=3.2
|
||||||
- DB=PGSQL CORE_RELEASE=3
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- php: 5.4
|
- php: 5.6
|
||||||
env: DB=MYSQL CORE_RELEASE=3
|
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:
|
before_script:
|
||||||
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
|
- composer self-update || true
|
||||||
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
|
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
|
||||||
- cd ~/builds/ss
|
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
|
||||||
|
- cd ~/builds/ss
|
||||||
|
- composer install
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- vendor/bin/phpunit dms/tests/
|
- vendor/bin/phpunit dms/tests
|
||||||
|
@ -175,7 +175,7 @@ class DMSDocumentAddController extends LeftAndMain
|
|||||||
public function Backlink()
|
public function Backlink()
|
||||||
{
|
{
|
||||||
$pageID = $this->currentPageID();
|
$pageID = $this->currentPageID();
|
||||||
return singleton('CMSPagesController')->Link().'edit/show/'.$pageID;
|
return Controller::join_links(singleton('CMSPagesController')->Link(), 'edit/show', $pageID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function documentautocomplete()
|
public function documentautocomplete()
|
||||||
|
Loading…
Reference in New Issue
Block a user