Merge branch 'release/3.1.7'

vdlp · Apr 19, 2023 · a3cd617 · a3cd617
2 parents b02efdc + c6e5f36
commit a3cd617
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.7] - 2023-04-19
+
+* Remove use of old BrandSetting constants (#103).
+
 ## [3.1.6] - 2023-03-28
 
 * Add support for October CMS 3.3

diff --git a/classes/BrandHelper.php b/classes/BrandHelper.php
@@ -23,8 +23,8 @@ protected function init(): void
             $colorPalette = BrandSetting::get('color_palette');
             $colorMode = BrandSetting::getColorMode();
 
-            $this->primaryColor = $colorPalette[$colorMode]['primary'] ?? BrandSetting::PRIMARY_COLOR;
-            $this->secondaryColor = $colorPalette[$colorMode]['secondary'] ?? BrandSetting::SECONDARY_COLOR;
+            $this->primaryColor = $colorPalette[$colorMode]['primary'] ?? '#6a6cf7';
+            $this->secondaryColor = $colorPalette[$colorMode]['secondary'] ?? '#72809d';
         // October CMS <3.2
         } else {
             $this->primaryColor = $brandSettings->get('primary_color');

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -79,4 +79,5 @@ v3.1.2: "Fix daily stats labels when selecting month/year."
 v3.1.3: "Maintenance release"
 v3.1.4: "Fix target field not loading properly. See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/3.1.4"
 v3.1.5: "Minor improvements. See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/3.1.5"
-v3.1.6: "Add support for October CMS 3.3."
+v3.1.6: "Add support for October CMS 3.3."
+v3.1.7: "Remove use of old BrandSetting constants."