MDL-43390 files: Only lock when locking is not prevented

2014-07-24 10:22:55 +08:00
parent 5fd0df97c5
commit 10ccdfb8cd
1 changed files with 9 additions and 1 deletions
@@ -1721,6 +1721,8 @@ class file_storage {
     * @return array (contenthash, filesize, newfile)
     */
    public function add_string_to_pool($content) {
+        global $CFG;
+
        $contenthash = sha1($content);
        $filesize = strlen($content); // binary length

@@ -1755,7 +1757,13 @@ class file_storage {
        // Hopefully this works around most potential race conditions.

        $prev = ignore_user_abort(true);
-        $newsize = file_put_contents($hashfile.'.tmp', $content, LOCK_EX);
+
+        if (!empty($CFG->preventfilelocking)) {
+            $newsize = file_put_contents($hashfile.'.tmp', $content);
+        } else {
+            $newsize = file_put_contents($hashfile.'.tmp', $content, LOCK_EX);
+        }
+
        if ($newsize === false) {
            // Borked permissions most likely.
            ignore_user_abort($prev);