MDL-40435 detect permission setting problems in core_component

moodle · Jul 13, 2013 · 766e04f · 766e04f
1 parent d7245e3
commit 766e04f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/classes/component.php b/lib/classes/component.php
@@ -155,16 +155,21 @@ protected static function init() {
                 unlink($cachefile);
             }
 
+            // Permissions might not be setup properly in installers.
+            $dirpermissions = !isset($CFG->directorypermissions) ? 02777 : $CFG->directorypermissions;
+            $filepermissions = !isset($CFG->filepermissions) ? ($dirpermissions & 0666) : $CFG->filepermissions;
+
+            clearstatcache();
             $cachedir = dirname($cachefile);
             if (!is_dir($cachedir)) {
-                mkdir($cachedir, $CFG->directorypermissions, true);
+                mkdir($cachedir, $dirpermissions, true);
             }
 
             if ($fp = @fopen($cachefile.'.tmp', 'xb')) {
                 fwrite($fp, $content);
                 fclose($fp);
                 @rename($cachefile.'.tmp', $cachefile);
-                @chmod($cachefile, $CFG->filepermissions);
+                @chmod($cachefile, $filepermissions);
             }
             @unlink($cachefile.'.tmp'); // Just in case anything fails (race condition).
             self::invalidate_opcode_php_cache($cachefile);