diff --git a/composer.json b/composer.json index fdad08a..47e3013 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,10 @@ "issues": "http://github.com/chrometoasters/silverstripe-advanced-taxonomies/issues" }, "require": { - "silverstripe/admin": "^1", - "silverstripe/framework": "^4", - "silverstripe/vendor-plugin": "^1", - "symbiote/silverstripe-gridfieldextensions": "^3.2.3" + "silverstripe/admin": "^2", + "silverstripe/framework": "^5", + "silverstripe/vendor-plugin": "^2", + "symbiote/silverstripe-gridfieldextensions": "^4" }, "extra": { "expose": [ diff --git a/src/Forms/GridFieldInfoLink.php b/src/Forms/GridFieldInfoLink.php index 07e3f8f..f7538c5 100644 --- a/src/Forms/GridFieldInfoLink.php +++ b/src/Forms/GridFieldInfoLink.php @@ -30,7 +30,7 @@ class GridFieldInfoLink implements GridField_HTMLProvider * * @var string */ - protected $caption; + protected $label; /** diff --git a/src/Models/TaxonomyTerm.php b/src/Models/TaxonomyTerm.php index 6c9a4f7..04abc85 100644 --- a/src/Models/TaxonomyTerm.php +++ b/src/Models/TaxonomyTerm.php @@ -143,7 +143,7 @@ public function getCMSFields() $fields->removeByName('DataObjectTaxonomyTerms'); // Begin to use _t(), first disable 'missing_default_warning', which allows _t() to be called without default - i18n::config()->merge('missing_default_warning', false); + i18n::config()->set('missing_default_warning', false); // Define a literalField that presents empty line , and could be reused in many occasionz. $lineBreak = LiteralField::create('LineBreak', '
');