Merge branch 'release/1.0.3'

getgrav · Dec 12, 2015 · 4a5a400 · 4a5a400
2 parents fcdd0bc + 96d7c47
commit 4a5a400
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.3
+## 12/11/2015
+
+1. [](#bugfix)
+    * Fixed issue when saving config causing incorrect image cache folder perms
+
 # v1.0.2
 ## 12/11/2015
 

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
@@ -706,8 +706,8 @@ form:
                     help: PLUGIN_ADMIN.CACHE_PERMS_HELP
                     highlight: '0755'
                     options:
-                        1: '0755'
-                        0: '0775'
+                        '0755': '0755'
+                        '0775': '0775'
 
 
                 images.debug:

diff --git a/system/defines.php b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.2');
+define('GRAV_VERSION', '1.0.3');
 define('DS', '/');
 
 // Directories and Paths

diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php
@@ -80,7 +80,8 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false)
 
         // Asking the cache for the cacheFile
         try {
-            $perms = octdec(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();

diff --git a/system/tests/Grav/Test/.gitkeep b/system/tests/Grav/Test/.gitkeep
diff --git a/system/tests/Grav/TestCase.php b/system/tests/Grav/TestCase.php
diff --git a/system/tests/bootstrap.php b/system/tests/bootstrap.php
diff --git a/system/tests/phpunit.xml b/system/tests/phpunit.xml