L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w51_MDL-30621_m22_protectdir' of git://github.com/skodak/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-12-13 10:17:56 +13:00
parent b750cfde81 f9c5bd9234
commit e79c09855c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/setuplib.php
+12 -2
View File
@@ -1193,7 +1193,12 @@ function make_upload_directory($directory, $exceptiononerror = true) {
*/
function make_temp_directory($directory, $exceptiononerror = true) {
global $CFG;
protect_directory($CFG->tempdir);
if ($CFG->tempdir !== "$CFG->dataroot/temp") {
check_dir_exists($CFG->tempdir, true, true);
protect_directory($CFG->tempdir);
} else {
protect_directory($CFG->dataroot);
}
return make_writable_directory("$CFG->tempdir/$directory", $exceptiononerror);
}
@@ -1206,7 +1211,12 @@ function make_temp_directory($directory, $exceptiononerror = true) {
*/
function make_cache_directory($directory, $exceptiononerror = true) {
global $CFG;
protect_directory($CFG->cachedir);
if ($CFG->cachedir !== "$CFG->dataroot/cache") {
check_dir_exists($CFG->cachedir, true, true);
protect_directory($CFG->cachedir);
} else {
protect_directory($CFG->dataroot);
}
return make_writable_directory("$CFG->cachedir/$directory", $exceptiononerror);
}