diff --git a/.travis.yml b/.travis.yml index 4798e607..f4d97824 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,14 @@ php: - 7.0 env: - - DB=MYSQL CORE_RELEASE=3 + - DB=MYSQL CORE_RELEASE=3.3 matrix: include: - php: 5.6 env: DB=PGSQL CORE_RELEASE=3 + - php: 5.6 + env: DB=PGSQL CORE_RELEASE=3.2 allow_failures: - php: 7.0 diff --git a/code/SideReport.php b/code/SideReport.php index 61832feb..29513b48 100644 --- a/code/SideReport.php +++ b/code/SideReport.php @@ -88,8 +88,9 @@ class SideReportView extends ViewableData { } if(isset($info['link']) && $info['link']) { - $linkBase = singleton('CMSPageEditController')->Link('show') . '/'; - $link = ($info['link'] === true) ? $linkBase . $record->ID : $info['link']; + $link = ($info['link'] === true && $record->hasMethod('CMSEditLink')) + ? $record->CMSEditLink() + : $info['link']; return $prefix . "$val"; } else { return $prefix . "$val"; diff --git a/composer.json b/composer.json index 0e16eb71..cdb6e4c8 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.3.3", + "php": ">=5.3.3,<7", "silverstripe/framework": "~3.3" }, "extra": {