Merging fixes from MOODLE_16_STABLE

diff --git a/lib/speller/server-scripts/spellchecker.php b/lib/speller/server-scripts/spellchecker.php
index b14cad185d6f4f8b134b31664676b4e873754cfe..9c2cb716c9ac4854bb94d44519d314a4a2f4da8f 100644 (file)
--- a/lib/speller/server-scripts/spellchecker.php
+++ b/lib/speller/server-scripts/spellchecker.php
@@ -23,7 +23,7 @@ $aspell_opts = '-a -H --lang='. $lang .' --encoding=utf-8';
 if (!empty($CFG->aspellextradicts)) {   // eg /usr/bin/.aspell.en.pws
     $aspell_opts .= ' --add-extra-dicts='.$CFG->aspellextradicts;
 }
-$tempfiledir = './';
+$tempfiledir = $CFG->dataroot; // Use dataroot since it must be writable
 $input_separator = 'A';
 
 function check_language($cmd) {