lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5387 from frederic34/patch-8

Browse Source 
FIX Using parm instead of this in function pdfGetHeightForHtmlContent
This commit is contained in:
Laurent Destailleur 2016-06-23 20:22:17 +02:00 committed by GitHub
commit 05cbf37aca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/pdf.lib.php
View File

@ -318,15 +318,15 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
else else
{ {
for ($page=$start_page; $page <= $end_page; ++$page) { for ($page=$start_page; $page <= $end_page; ++$page) {
$this->setPage($page); $pdf->setPage($page);
if ($page == $start_page) { if ($page == $start_page) {
// first page // first page
$height = $this->h - $start_y - $this->bMargin; $height = $pdf->h - $start_y - $pdf->bMargin;
} elseif ($page == $end_page) { } elseif ($page == $end_page) {
// last page // last page
$height = $end_y - $this->tMargin; $height = $end_y - $pdf->tMargin;
} else { } else {
$height = $this->h - $this->tMargin - $this->bMargin; $height = $pdf->h - $pdf->tMargin - $pdf->bMargin;
} }
} }
} }