From 9d0e0519f26950aa2b6ddfe858572affa9c0d42f Mon Sep 17 00:00:00 2001
From: Peter Dias <peter@moodle.com>
Date: Thu, 26 Aug 2021 13:39:30 +0800
Subject: [PATCH] MDL-70376 mod_assign: Reintroduce pdf orientation check

Reintroduce the orientation check and sizing when importing an image
---
 mod/assign/feedback/editpdf/classes/pdf.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod/assign/feedback/editpdf/classes/pdf.php b/mod/assign/feedback/editpdf/classes/pdf.php
index a2e919ce48f..9382d60dfef 100644
--- a/mod/assign/feedback/editpdf/classes/pdf.php
+++ b/mod/assign/feedback/editpdf/classes/pdf.php
@@ -824,13 +824,14 @@ class pdf extends TcpdfFpdi {
         $this->currentpage++;
         $template = $this->importPage($this->currentpage);
         $size = $this->getTemplateSize($template);
-
+        $orientation = 'P';
         if ($imageinfo["width"] > $imageinfo["height"]) {
             if ($size['width'] < $size['height']) {
                 $temp = $size['width'];
                 $size['width'] = $size['height'];
                 $size['height'] = $temp;
             }
+            $orientation = 'L';
         } else if ($imageinfo["width"] < $imageinfo["height"]) {
             if ($size['width'] > $size['height']) {
                 $temp = $size['width'];
@@ -838,7 +839,7 @@ class pdf extends TcpdfFpdi {
                 $size['height'] = $temp;
             }
         }
-        $orientation = $size['orientation'];
+
         $this->SetHeaderMargin(0);
         $this->SetFooterMargin(0);
         $this->SetMargins(0, 0, 0, true);
@@ -847,7 +848,7 @@ class pdf extends TcpdfFpdi {
 
         $this->AddPage($orientation, $size);
         $this->SetAutoPageBreak(false, 0);
-        $this->Image('@' . $imagecontent, 0, 0, $size['w'], $size['h'],
+        $this->Image('@' . $imagecontent, 0, 0, $size['width'], $size['height'],
             '', '', '', false, null, '', false, false, 0);
     }
 }