From 6b9154d1f3f7fed1da40083962ba8bdcfbb8fcc8 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 11 Dec 2015 22:08:59 -0700 Subject: [PATCH 1/6] Fix for cleaning build on linux --- system/src/Grav/Console/Cli/CleanCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php index 767406bfc..adcf87638 100644 --- a/system/src/Grav/Console/Cli/CleanCommand.php +++ b/system/src/Grav/Console/Cli/CleanCommand.php @@ -93,7 +93,7 @@ class CleanCommand extends Command 'vendor/maximebf/debugbar/bower.json', 'vendor/maximebf/debugbar/composer.json', 'vendor/maximebf/debugbar/.bowerrc', - 'vendor/maximebf/debugbar/src/Debugbar/Resources/vendor', + 'vendor/maximebf/debugbar/src/DebugBar/Resources/vendor', 'vendor/maximebf/debugbar/demo', 'vendor/maximebf/debugbar/docs', 'vendor/maximebf/debugbar/tests', From 0e810c15e2777c86f0f22093c6060191a5542afb Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Fri, 11 Dec 2015 21:17:19 -0800 Subject: [PATCH 2/6] Keep going if files are not found while creating a new project --- system/src/Grav/Console/Cli/SandboxCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php index 3b1142646..2e89916f9 100644 --- a/system/src/Grav/Console/Cli/SandboxCommand.php +++ b/system/src/Grav/Console/Cli/SandboxCommand.php @@ -162,7 +162,7 @@ class SandboxCommand extends ConsoleCommand $to = $this->destination . $target; $this->output->writeln(' ' . $source . ' -> ' . $to); - Folder::rcopy($from, $to); + @Folder::rcopy($from, $to); } } From 7e3058e3f0012df9ee88e2d867182b0e159d5464 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sat, 12 Dec 2015 10:13:21 +0100 Subject: [PATCH 3/6] Fix issue in images cache permissions the leading '0' in the default 0755 was omitted as interpreted as an integer, leading to errors in setting the images cache folder permissions (not readable by Grav) --- system/src/Grav/Common/Page/Medium/ImageFile.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php index c71cd0efd..2aa308ff7 100644 --- a/system/src/Grav/Common/Page/Medium/ImageFile.php +++ b/system/src/Grav/Common/Page/Medium/ImageFile.php @@ -80,8 +80,7 @@ class ImageFile extends Image // Asking the cache for the cacheFile try { - $perms = self::getGrav()['config']->get('system.images.cache_perms', '0755'); - $perms = octdec($perms); + $perms = (string)self::getGrav()['config']->get('system.images.cache_perms', '0755'); $file = $this->cache->setDirectoryMode($perms)->getOrCreateFile($cacheFile, $conditions, $generate, $actual); } catch (GenerationError $e) { $file = $e->getNewFile(); From 566c5cb38f19c8184d03eaf6ffabea1359b091c2 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sat, 12 Dec 2015 10:18:32 +0100 Subject: [PATCH 4/6] Revert "Fix issue in images cache permissions" This reverts commit 7e3058e3f0012df9ee88e2d867182b0e159d5464. --- system/src/Grav/Common/Page/Medium/ImageFile.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php index 2aa308ff7..c71cd0efd 100644 --- a/system/src/Grav/Common/Page/Medium/ImageFile.php +++ b/system/src/Grav/Common/Page/Medium/ImageFile.php @@ -80,7 +80,8 @@ class ImageFile extends Image // Asking the cache for the cacheFile try { - $perms = (string)self::getGrav()['config']->get('system.images.cache_perms', '0755'); + $perms = self::getGrav()['config']->get('system.images.cache_perms', '0755'); + $perms = octdec($perms); $file = $this->cache->setDirectoryMode($perms)->getOrCreateFile($cacheFile, $conditions, $generate, $actual); } catch (GenerationError $e) { $file = $e->getNewFile(); From 40f5d577370c52db17d60eeda7cab0b1f11ecd97 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 12 Dec 2015 08:43:41 -0700 Subject: [PATCH 5/6] Default value not in quotes. Needs to be a string for Admin compatibility - https://docs.saltstack.com/en/latest/topics/troubleshooting/yaml_idiosyncrasies.html#integers-are-parsed-as-integers --- system/config/system.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/config/system.yaml b/system/config/system.yaml index 652524902..846ec740d 100644 --- a/system/config/system.yaml +++ b/system/config/system.yaml @@ -97,7 +97,7 @@ debugger: images: default_image_quality: 85 # Default image quality to use when resampling images (85%) cache_all: false # Cache all image by default - cache_perms: 0755 # Default cache folder perms. Usually 0755 or 0775 depending on setup + cache_perms: '0755' # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775' debug: false # Show an overlay over images indicating the pixel depth of the image when working with retina for example media: From 653edb064b8faa74d4730a61f0b872438014d123 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 12 Dec 2015 13:03:22 -0700 Subject: [PATCH 6/6] version update --- CHANGELOG.md | 6 ++++++ system/defines.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb6a8de4..d51bda0d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.0.4 +## 12/12/2015 + +1. [](#bugfix) + * Needed to put default image folder permissions for YAML compatibility + # v1.0.3 ## 12/11/2015 diff --git a/system/defines.php b/system/defines.php index 90a909d0c..b372a5046 100644 --- a/system/defines.php +++ b/system/defines.php @@ -2,7 +2,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.0.3'); +define('GRAV_VERSION', '1.0.4'); define('DS', '/'); // Directories and Paths