mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '3.6' into 3
This commit is contained in:
commit
273a087f5a
@ -79,7 +79,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
|
||||
* @config
|
||||
* @var string
|
||||
*/
|
||||
private static $help_link = '//userhelp.silverstripe.org/framework/en/3.5';
|
||||
private static $help_link = '//userhelp.silverstripe.org/framework/en/3.6';
|
||||
|
||||
/**
|
||||
* @var array
|
||||
|
@ -591,7 +591,7 @@ abstract class DBSchemaManager {
|
||||
if (!isset($this->tableList[strtolower($table)])) $newTable = true;
|
||||
|
||||
if (is_array($spec)) {
|
||||
$specValue = $this->$spec_orig['type']($spec_orig['parts']);
|
||||
$specValue = $this->{$spec_orig['type']}($spec_orig['parts']);
|
||||
} else {
|
||||
$specValue = $spec;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user