diff --git a/.travis.yml b/.travis.yml index 46305a731..129244d26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ env: matrix: allow_failures: - php: hhvm - - php: nightly include: - php: 5.4 @@ -38,8 +37,6 @@ matrix: env: DB=MYSQL BEHAT_TEST=1 - php: 5.3 env: DB=MYSQL - - php: nightly - env: DB=MYSQL - php: hhvm env: DB=MYSQL diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php index e2b91e185..3f35a7d2e 100644 --- a/admin/code/ModelAdmin.php +++ b/admin/code/ModelAdmin.php @@ -354,7 +354,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,