]> git.mjollnir.org Git - moodle.git/commitdiff
Merge from 1.6 branch. Fix URL syntax error when slasharguments is off.
authortjhunt <tjhunt>
Wed, 17 May 2006 11:40:37 +0000 (11:40 +0000)
committertjhunt <tjhunt>
Wed, 17 May 2006 11:40:37 +0000 (11:40 +0000)
question/export.php

index bee47cfd86663ae8d09f404f5e57f37888532eaa..fcdd42ecec90da557666dc51949b7c1c34a8ab47 100644 (file)
         $quizexportdir = get_string( 'exportfilename', 'quiz' );
         $downloadextra_str = get_string( 'downloadextra','quiz' );
         if ($CFG->slasharguments) {
-          $efile = "{$CFG->wwwroot}/file.php/$course->id/$quizexportdir/$exportfilename".$file_ext;
+          $efile = "{$CFG->wwwroot}/file.php/$course->id/$quizexportdir/$exportfilename".$file_ext."?forcedownload=1";
         }
         else {
-          $efile = "{$CFG->wwwroot}/file.php?file=/$course->id/$quizexportdir/$exportfilename".$file_ext;
+          $efile = "{$CFG->wwwroot}/file.php?file=/$course->id/$quizexportdir/$exportfilename".$file_ext."&forcedownload=1";
         }
-       $efile .= "?forcedownload=1";
         echo "</p><center><a href=\"$efile\">$download_str</a></center></p>";
         echo "</p><center><font size=\"-1\">$downloadextra_str</font></center></p>";