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

Merge branch '3.2' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2015-08-18 16:40:20 +01:00
commit 0b177ad20f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -25,7 +25,6 @@ env:
matrix: matrix:
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- php: nightly
include: include:
- php: 5.4 - php: 5.4
@ -38,8 +37,6 @@ matrix:
env: DB=MYSQL BEHAT_TEST=1 env: DB=MYSQL BEHAT_TEST=1
- php: 5.3 - php: 5.3
env: DB=MYSQL env: DB=MYSQL
- php: nightly
env: DB=MYSQL
- php: hhvm - php: hhvm
env: DB=MYSQL env: DB=MYSQL

2
admin/code/ModelAdmin.php
View File

@ -354,7 +354,7 @@ abstract class ModelAdmin extends LeftAndMain {
$specRelations->push(new ArrayData(array('Name' => $name, 'Description' => $desc))); $specRelations->push(new ArrayData(array('Name' => $name, 'Description' => $desc)));
} }
$specHTML = $this->customise(array( $specHTML = $this->customise(array(
'ClassName' => str_replace('\\', '_', $className), 'ClassName' => $this->sanitiseClassName($this->modelClass),
'ModelName' => Convert::raw2att($modelName), 'ModelName' => Convert::raw2att($modelName),
'Fields' => $specFields, 'Fields' => $specFields,
'Relations' => $specRelations, 'Relations' => $specRelations,