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

Merge branch '3.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-06-14 14:29:15 +01:00
commit 273a087f5a
No known key found for this signature in database
GPG Key ID: 229831A941962E26
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/LeftAndMain.php
View File

@ -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

2
model/connect/DBSchemaManager.php
View File

@ -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;
}