Adapted to new FPDF version

Author: iherwig

src/wcmf/lib/pdf/PDF.php

@@ -33,10 +33,13 @@ class PDF extends Fpdi {
 
   /**
    * Overridden to set the template on the page
+   * TODO check if this is still necessary, if useTemplate is called in PDFTemplate::output() now
    */
   public function Header() {
     parent::Header();
-    $this->useTemplate($this->tpl);
+    if ($this->currentTemplateId) {
+      $this->useTemplate($this->currentTemplateId);
+    }
   }
 
   /**

src/wcmf/lib/pdf/PDFTemplate.php

@@ -103,7 +103,8 @@ public function output($name='', $dest='') {
       // add each page
       $tplIndex = $this->pdf->ImportPage($i);
       $size = $this->pdf->getTemplatesize($tplIndex);
-      $this->pdf->AddPage($size['h'] > $size['w'] ? 'P' : 'L');
+      $this->pdf->AddPage($size['orientation']);
+      $this->pdf->useTemplate($tplIndex);
 
       // render the PDFPage onto the template page
       if ($pageIndex < sizeof($this->pages)) {