diff --git a/Changelog.md b/Changelog.md index 2196ef79..142bf1b3 100644 --- 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 index ef644baa..0b293cb3 100644 --- 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; }