Merge pull request #16 from Firesphere/feature/fix-get-set-config

Use proper get/set methods to allow for config overrides in YML
HelloBetterLTD · Oct 26, 2017 · 194f8a1 · 194f8a1
2 parents 246ecf0 + 2dfab66
commit 194f8a1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/forms/MarkdownEditorConfig.php b/src/forms/MarkdownEditorConfig.php
@@ -9,6 +9,7 @@
 
 namespace SilverStripers\markdown\forms;
 
+use SilverStripe\Core\Config\Config_ForClass;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injectable;
@@ -135,7 +136,7 @@ public static function get($identifier = null)
      */
     public static function get_active_identifier()
     {
-        return static::$current ?: static::config()->get('default_config');
+        return static::config()->get('current') ?: static::config()->get('default_config');
     }
 
     /**
@@ -148,11 +149,11 @@ public static function get_active()
 
     /**
      * @param MarkdownEditorConfig $config
-     * @return MarkdownEditorConfig
+     * @return Config_ForClass
      */
     public static function set_active(MarkdownEditorConfig $config)
     {
-        return static::get_active_identifier();
+        return static::config()->update('current', $config);
     }
 
     /**