diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 2c5ff2e..6c17050 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,5 +1,8 @@ +5.9.107 (2011-08-08) + - THis version includes a minor bugfix. + 5.9.106 (2011-08-04) - - This version includes transparency groups: check the new parameter on printTemplate() method and example 62. + - This version includes transparency groups: check the new parameter on startTemplate() method and example 62. 5.9.105 (2011-08-04) - Bug item #3386153 "Check Box not ticked when set to true" was fixed. diff --git a/README.TXT b/README.TXT index 9bbf2eb..5f5ea2f 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.106 -Release date: 2011-08-04 +Version: 5.9.107 +Release date: 2011-08-08 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index c6318dc..327433a 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.106 + * @version 5.9.107 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -148,7 +148,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php'); * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.106 + * @version 5.9.107 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -159,7 +159,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.106'; + private $tcpdf_version = '5.9.107'; // Protected properties @@ -8608,10 +8608,10 @@ class TCPDF { * @param $page (string) Page content. * @param $replace (array) Array of replacements (array keys are replacement strings, values are alias arrays). * @param $diff (int) If passed, this will be set to the total char number difference between alias and replacements. - * @return replaced page content. + * @return replaced page content and updated $diff parameter as array. * @protected */ - protected function replacePageNumAliases($page, $replace, &$diff=0) { + protected function replacePageNumAliases($page, $replace, $diff=0) { foreach ($replace as $rep) { foreach ($rep[3] as $a) { $count = 0; @@ -8621,7 +8621,7 @@ class TCPDF { } } } - return $page; + return array($page, $diff); } /** @@ -8707,7 +8707,7 @@ class TCPDF { $replace[] = array($ptga, $ptg_num_chars, 7, $pnalias[2]['a']); $replace[] = array($pngu, $png_num_chars, 9, $pnalias[3]['u']); $replace[] = array($pnga, $png_num_chars, 7, $pnalias[3]['a']); - $temppage = $this->replacePageNumAliases($temppage, $replace, $gdiff); + list($temppage, $gdiff) = $this->replacePageNumAliases($temppage, $replace, $gdiff); } // replace page numbers $replace = array(); @@ -8715,7 +8715,7 @@ class TCPDF { $replace[] = array($ptpa, $ptp_num_chars, 7, $pnalias[0]['a']); $replace[] = array($pnpu, $pnp_num_chars, 9, $pnalias[1]['u']); $replace[] = array($pnpa, $pnp_num_chars, 7, $pnalias[1]['a']); - $temppage = $this->replacePageNumAliases($temppage, $replace, $pdiff); + list($temppage, $pdiff) = $this->replacePageNumAliases($temppage, $replace, $pdiff); // replace right shift alias $temppage = $this->replaceRightShiftPageNumAliases($temppage, $pnalias[4], max($pdiff, $gdiff)); // replace EPS marker