Merge pull request #61 from percipioglobal/develop

Version 1.4.1.1 hotfix #59
craftpulse · Dec 11, 2020 · 877a5ed · 877a5ed
2 parents cf8cd16 + 02db838
commit 877a5ed
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,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 1.4.1.1 - 2020-12-11
+
+- Fixes #59(https://github.com/percipioglobal/craft-colour-swatches/issues/59); another colour/color bug. 
+
 ## 1.4.1 - 2020-12-09
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "percipioglobal/craft-colour-swatches",
     "description": "Let clients choose from a predefined set of colours.",
     "type": "craft-plugin",
-    "version": "1.4.1",
+    "version": "1.4.1.1",
     "keywords": [
         "craft",
         "cms",
@@ -32,7 +32,7 @@
     "extra": {
         "name": "Colour Swatches",
         "handle": "colour-swatches",
-        "schemaVersion": "1.4.1",
+        "schemaVersion": "1.4.1.1",
         "hasCpSettings": false,
         "hasCpSection": false,
         "changelogUrl": "https://raw.githubusercontent.com/percipioglobal/craft-colour-swatches/master/CHANGELOG.md",

diff --git a/src/fields/ColourSwatches.php b/src/fields/ColourSwatches.php
@@ -128,7 +128,7 @@ public function getSettingsHtml()
                     $rows = Plugin::$plugin
                         ->settings->colors ? Plugin::$plugin
                         ->settings->colors : Plugin::$plugin
-                        ->settings->colours;
+                        ->settings->colors;
                 }
 
                 $config = ['instructions' => Craft::t('colour-swatches', 'Define the available colors.') , 'id' => 'options', 'name' => 'options', 'addRowLabel' => Craft::t('colour-swatches', 'Add a colour') , 'cols' => ['label' => ['heading' => Craft::t('colour-swatches', 'Label') , 'type' => 'singleline', ], 'color' => ['heading' => Craft::t('colour-swatches', 'Hex Colours (comma seperated)') , 'type' => 'singleline', ], 'default' => ['heading' => Craft::t('colour-swatches', 'Default?') , 'type' => 'checkbox', 'class' => 'thin', ], ], 'rows' => $rows, ];