From a73f9ba8fb678f56b9fbf5d80b35abbcf7152a04 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Mon, 17 Aug 2015 16:46:38 +0100 Subject: [PATCH 1/2] Remove nightly build as PHP 7 support is explicitly off --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0feb4ce58..d0c4a6720 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ env: matrix: allow_failures: - php: hhvm - - php: nightly include: - php: 5.5 @@ -36,8 +35,6 @@ matrix: env: DB=MYSQL BEHAT_TEST=1 - php: 5.3 env: DB=MYSQL - - php: nightly - env: DB=MYSQL - php: hhvm env: DB=MYSQL From 8b638f56fb737dac18126c291297c87469eb7d0f Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Tue, 18 Aug 2015 15:37:15 +0100 Subject: [PATCH 2/2] FIX: Using undefined var in ModelAdmin --- admin/code/ModelAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php index 2bb77ab5b..715132fa2 100644 --- a/admin/code/ModelAdmin.php +++ b/admin/code/ModelAdmin.php @@ -366,7 +366,7 @@ abstract class ModelAdmin extends LeftAndMain { $specRelations->push(new ArrayData(array('Name' => $name, 'Description' => $desc))); } $specHTML = $this->customise(array( - 'ClassName' => str_replace('\\', '_', $className), + 'ClassName' => $this->sanitiseClassName($this->modelClass), 'ModelName' => Convert::raw2att($modelName), 'Fields' => $specFields, 'Relations' => $specRelations,