### Eclipse Workspace Patch 1.0 #P drupal_cocomore Index: print/dev/print_pdf/print_pdf.pages.inc =================================================================== --- print/dev/print_pdf/print_pdf.pages.inc (revision 585) +++ print/dev/print_pdf/print_pdf.pages.inc (working copy) @@ -239,9 +239,9 @@ $pdf->setRTL(TRUE); } - $pdf = theme('print_pdf_tcpdf_header', $pdf, $html, $font); - $pdf = theme('print_pdf_tcpdf_footer', $pdf, $html, $font); - $pdf = theme('print_pdf_tcpdf_page', $pdf); + theme('print_pdf_tcpdf_header', $pdf, $html, $font); + theme('print_pdf_tcpdf_footer', $pdf, $html, $font); + theme('print_pdf_tcpdf_page', $pdf); //initialize document $pdf->AliasNbPages(); @@ -249,7 +249,7 @@ // add a page $pdf->AddPage(); - $pdf = theme('print_pdf_tcpdf_content', $pdf, $html, $font); + theme('print_pdf_tcpdf_content', $pdf, $html, $font); // reset pointer to the last page $pdf->lastPage(); @@ -416,7 +416,7 @@ * array with the font definition (font name, styles and size) * @see theme_print_pdf_tcpdf_header() */ -function theme_print_pdf_tcpdf_header(&$pdf, &$html, $font) { +function theme_print_pdf_tcpdf_header($pdf, $html, $font) { preg_match('!!si', $html, $tpl_logo); preg_match('!

(.*?)

!si', $html, $tpl_title); preg_match('!!si', $html, $tpl_site_name); @@ -436,8 +436,6 @@ $pdf->SetHeaderMargin(5); // set header data $pdf->SetHeaderData($logo, 10 * $ratio, html_entity_decode($tpl_title[1], ENT_QUOTES, 'UTF-8'), strip_tags($tpl_site_name[1])); - - return $pdf; } /** @@ -447,7 +445,7 @@ * current TCPDF object * @see theme_print_pdf_tcpdf_page() */ -function theme_print_pdf_tcpdf_page(&$pdf) { +function theme_print_pdf_tcpdf_page($pdf) { // set margins $pdf->SetMargins(15, 20, 15); // set auto page breaks @@ -458,8 +456,6 @@ $pdf->setImageScale($imagescale); // set image compression quality $pdf->setJPEGQuality(100); - - return $pdf; } /** @@ -473,7 +469,7 @@ * array with the font definition (font name, styles and size) * @see theme_print_pdf_tcpdf_content() */ -function theme_print_pdf_tcpdf_content(&$pdf, &$html, $font) { +function theme_print_pdf_tcpdf_content($pdf, $html, $font) { // set content font $pdf->setFont($font[0], $font[1], $font[2]); @@ -495,8 +491,6 @@ } while ($prev != $matches[1]); @$pdf->writeHTML($matches[1]); - - return $pdf; } /**