Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle

moodle · May 8, 2017 · 7167d25 · 7167d25
2 parents 48ad736 + fcdd773
commit 7167d25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
@@ -845,7 +845,8 @@ function repository_filesystem_pluginfile($course, $cm, $context, $filearea, $ar
     // Find stored or generated thumbnail.
     if (!($file = $repo->get_thumbnail($filepath, $filearea))) {
         // Generation failed, redirect to default icon for file extension.
-        redirect($OUTPUT->image_url(file_extension_icon($file, 90)));
+        // Do not use redirect() here because is not compatible with webservice/pluginfile.php.
+        header('Location: ' . $OUTPUT->image_url(file_extension_icon($file, 90)));
     }
     // The thumbnails should not be changing much, but maybe the default lifetime is too long.
     $lifetime = $CFG->filelifetime;

diff --git a/repository/googledocs/lib.php b/repository/googledocs/lib.php
@@ -636,7 +636,8 @@ public function send_file($storedfile, $lifetime=null , $filter=0, $forcedownloa
             }
             send_file($downloaded['path'], $filename, $lifetime, $filter, false, $forcedownload, '', false, $options);
         } else if ($source->link) {
-            redirect($source->link);
+            // Do not use redirect() here because is not compatible with webservice/pluginfile.php.
+            header('Location: ' . $source->link);
         } else {
             $details = 'File is missing source link';
             throw new repository_exception('errorwhilecommunicatingwith', 'repository', '', $details);

diff --git a/repository/onedrive/lib.php b/repository/onedrive/lib.php
@@ -583,7 +583,8 @@ public function send_file($storedfile, $lifetime=null , $filter=0, $forcedownloa
             $filename = $storedfile->get_filename();
             send_file($downloaded['path'], $filename, $lifetime, $filter, false, $forcedownload, '', false, $options);
         } else if ($source->link) {
-            redirect($source->link);
+            // Do not use redirect() here because is not compatible with webservice/pluginfile.php.
+            header('Location: ' . $source->link);
         } else {
             $details = 'File is missing source link';
             throw new repository_exception('errorwhilecommunicatingwith', 'repository', '', $details);