Merge branch 'hotfix/3.0.11'

factorial-io · May 19, 2019 · 17856f1 · 17856f1
2 parents 93d15c8 + 36bf145
commit 17856f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,11 +1,17 @@
 # Changelog
 
+## 3.0.11 / 2019-05-19
+
+### Fixed
+
+  * Fix bug when using inheritsFromBlueprint
+
 ## 3.0.10 / 2019-05-19
 
 ### Added
 
   * Add new inheritFromBlueprint config, so a host-config can inherit from a blueprinted config
-				
+
 				hosts:
 				  local:
 				    inheritFromBlueprint:

diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php
@@ -5,7 +5,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.0.10';
+    const FALLBACK_VERSION = '3.0.11';
 
     public static function mergeData(array $data, array $override_data): array
     {
@@ -116,7 +116,7 @@ public static function isAssocArray($arr)
 
     public static function prependRootFolder($rootFolder, $subfolder)
     {
-        if (strpos($rootFolder, $subfolder) === false) {
+        if (strpos($subfolder, $rootFolder) === false) {
             return $rootFolder . $subfolder;
         }