From bb57cb8e34a815ec004ee4984b4d9bdc55ca66b3 Mon Sep 17 00:00:00 2001
From: Adam Olley <adam.olley@netspot.com.au>
Date: Thu, 27 Mar 2014 10:07:41 +1030
Subject: [PATCH] MDL-44822 assignfeedback_editpdf: Stop test generation in
 is_enabled()

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.
---
 mod/assign/feedback/editpdf/classes/pdf.php | 8 ++++----
 mod/assign/feedback/editpdf/locallib.php    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/assign/feedback/editpdf/classes/pdf.php b/mod/assign/feedback/editpdf/classes/pdf.php
index c3c5f0079cf..87bec4c443b 100644
--- a/mod/assign/feedback/editpdf/classes/pdf.php
+++ b/mod/assign/feedback/editpdf/classes/pdf.php
@@ -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;
         }
 
diff --git a/mod/assign/feedback/editpdf/locallib.php b/mod/assign/feedback/editpdf/locallib.php
index bca275c2593..f301e6698f0 100644
--- a/mod/assign/feedback/editpdf/locallib.php
+++ b/mod/assign/feedback/editpdf/locallib.php
@@ -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;
         }