Fix issue with webroot. Bump to 1.2.0.1

vaersaagod · Feb 14, 2022 · 617ae1c · 617ae1c
1 parent b170653
commit 617ae1c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ToolMate Changelog
 
+## 1.2.0.1 - 2022-02-14
+### Fixed
+- Fixes an issue where Toolmate wasn't able to set the public web root path correctly
+
 ## 1.2.0 - 2022-02-13
 ### Added
 - Added `Settings::csp` for configuring the Content-Security-Policy header

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vaersaagod/toolmate",
     "description": "Is that a tool in your pocket, or are you just happy to see me, mate?",
     "type": "craft-plugin",
-    "version": "1.2.0",
+    "version": "1.2.0.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -4,9 +4,9 @@
 
 use Craft;
 use craft\base\Model;
-use craft\helpers\App;
 use craft\helpers\ConfigHelper;
 
+
 /**
  * ToolMate Settings Model
  *
@@ -40,6 +40,15 @@ class Settings extends Model
      */
     private $_csp;
 
+    /**
+     * @throws \yii\base\InvalidConfigException
+     */
+    public function init()
+    {
+        parent::init();
+        $this->setAttributes($this->getAttributes(), false);
+    }
+
     /**
      * @param array $values
      * @param bool $safeOnly
@@ -48,7 +57,7 @@ class Settings extends Model
     public function setAttributes($values, $safeOnly = true)
     {
 
-        $values['publicRoot'] = App::parseEnv($values['publicRoot'] ?? '@webroot');
+        $values['publicRoot'] = Craft::parseEnv($values['publicRoot'] ?? '@webroot');
 
         if ($values['embedCacheDuration'] === null) {
             $values['embedCacheDuration'] = Craft::$app->getConfig()->getGeneral()->cacheDuration;