mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()

Browse Source 
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
This commit is contained in:
Adam Olley 2014-03-27 10:07:41 +10:30
parent 9b8555fbea
commit 9f7674bddc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/assign/feedback/editpdf/classes/pdf.php
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;
}

2
mod/assign/feedback/editpdf/locallib.php
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 ($testpath->status == assignfeedback_editpdf\pdf::GSPATH_OK) {
return true;
}