tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.4' into 5.5

Browse Source
This commit is contained in:
Maxime Rainville 2020-05-26 15:11:46 +12:00
commit 319fa4734c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -1,6 +1,9 @@
language: php language: php
dist: trusty dist: xenial
services:
- mysql
env: env:
global: global:

1
code/Task/RecoverUploadLocationsHelper.php
View File

@ -248,7 +248,6 @@ class RecoverUploadLocationsHelper
if ($this->filesVersioned) { if ($this->filesVersioned) {
$draftVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::DRAFT, $fileId); $draftVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::DRAFT, $fileId);
$liveVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::LIVE, $fileId); $liveVersion = Versioned::get_versionnumber_by_stage(File::class, Versioned::LIVE, $fileId);
;
if ($draftVersion && $draftVersion != $liveVersion) { if ($draftVersion && $draftVersion != $liveVersion) {
$draft = Versioned::get_version(File::class, $fileId, $draftVersion); $draft = Versioned::get_version(File::class, $fileId, $draftVersion);