Merge remote branch 'upstream/master'

2013-03-19 10:20:49 -04:00
parent be174d0eed 0c845cc5b1
commit 4677b8588b
6 changed files with 64 additions and 38 deletions
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -858,7 +858,6 @@ class OutputDocument extends BaseOutputDocument
        }
        $doc = new DOMDocument('1.0', 'UTF-8');
        $doc->loadHtml($sContent);
-        $doc->encoding = 'UTF-8';
        $pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
        // ---------------------------------------------------------
        // Close and output PDF document