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

Merge branch 'MDL-44822_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-03-31 12:47:14 +08:00
parent 18b388efe7 bb57cb8e34
commit 26a44fc7bb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/classes/pdf.php
+4 -4
View File
@@ -546,13 +546,13 @@ class pdf extends \FPDI {
return $ret;
}
$testfile = $CFG->dirroot.'/mod/assign/feedback/editpdf/tests/fixtures/testgs.pdf';
if (!file_exists($testfile)) {
$ret->status = self::GSPATH_NOTESTFILE;
if (!$generateimage) {
return $ret;
}
if (!$generateimage) {
$testfile = $CFG->dirroot.'/mod/assign/feedback/editpdf/tests/fixtures/testgs.pdf';
if (!file_exists($testfile)) {
$ret->status = self::GSPATH_NOTESTFILE;
return $ret;
}
mod/assign/feedback/editpdf/locallib.php
+1 -1
View File
@@ -265,7 +265,7 @@ class assign_feedback_editpdf extends assign_feedback_plugin {
* @return bool
*/
public function is_enabled() {
$testpath = assignfeedback_editpdf\pdf::test_gs_path();
$testpath = assignfeedback_editpdf\pdf::test_gs_path(false);
if (!extension_loaded('zlib')) {
return false;
}