diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 8b18c0f..09e50bd 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +6.2.4 (2015-01-08) + - fix warning related to empty K_PATH_URL. + - fix error when a $table_colwidths key is not set. + 6.2.3 (2014-12-18) - New comment. - Moved the K_PATH_IMAGES definition in tcpdf_autoconfig. diff --git a/README.TXT b/README.TXT index 07ed3f8..5d26164 100644 --- a/README.TXT +++ b/README.TXT @@ -8,11 +8,11 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.2.3 -Release date: 2014-12-18 +Version: 6.2.4 +Release date: 2015-01-08 Author: Nicola Asuni -Copyright (c) 2002-2014: +Copyright (c) 2002-2015: Nicola Asuni Tecnick.com LTD www.tecnick.com diff --git a/composer.json b/composer.json index 1897293..f0aceda 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.2.3", + "version": "6.2.4", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php index da87518..cd86680 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -1,13 +1,13 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 1.1.0 + * @version 1.1.1 */ /** @@ -46,7 +46,7 @@ * Static methods used by the TCPDF class. * @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 1.1.0 + * @version 1.1.1 * @author Nicola Asuni - info@tecnick.com */ class TCPDF_STATIC { @@ -2480,7 +2480,7 @@ class TCPDF_STATIC { } $urldata = @parse_url($url); if (!isset($urldata['query']) OR (strlen($urldata['query']) <= 0)) { - if (strpos($url, K_PATH_URL) === 0) { + if (K_PATH_URL AND (strpos($url, K_PATH_URL) === 0)) { // convert URL to full server path $tmp = str_replace(K_PATH_URL, K_PATH_MAIN, $url); $tmp = htmlspecialchars_decode(urldecode($tmp)); diff --git a/tcpdf.php b/tcpdf.php index 92ac141..0a9f011 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,13 +1,13 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.2.3 + * @version 6.2.4 */ // TCPDF configuration @@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.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 6.2.3 + * @version 6.2.4 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -6819,10 +6819,10 @@ class TCPDF { if ($this->state != 2) { return; } - if ($x === '') { + if (strcmp($x, '') === 0) { $x = $this->x; } - if ($y === '') { + if (strcmp($y, '') === 0) { $y = $this->y; } // check page for no-write regions and adapt page margins if necessary @@ -18175,7 +18175,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: // inherit column width $cellw = 0; for ($i = 0; $i < $colspan; ++$i) { - $cellw += $table_colwidths[($colid + $i)]; + $cellw += (isset($table_colwidths[($colid + $i)]) ? $table_colwidths[($colid + $i)] : 0); } } $cellw += (($colspan - 1) * $cellspacing['H']);