From f7ec60686044046765f83958dd83feb71aaf85d8 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 2 Aug 2013 07:48:05 +0100 Subject: [PATCH] 6.0.022 (2013-08-02) - fixing initialization problem for signature_appearance property. --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- composer.json | 2 +- include/tcpdf_static.php | 4 ++-- tcpdf.php | 13 ++++++------- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 6b87acf..7f107f2 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.022 (2013-08-02) + - fixing initialization problem for signature_appearance property. + 6.0.021 (2013-07-18) - The bug caused by the preg_split function on some PHP 5.2.x versions was fixed. diff --git a/README.TXT b/README.TXT index ad384c4..26cfe21 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.021 -Release date: 2013-07-18 +Version: 6.0.022 +Release date: 2013-08-02 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index be0dac5..35d2b49 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.021", + "version": "6.0.022", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php index 19eccc4..e192822 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.021'; + private static $tcpdf_version = '6.0.022'; /** * String alias for total number of pages. @@ -2733,7 +2733,7 @@ class TCPDF_STATIC { * @param $flags (int) The flags as specified on the preg_split PHP function. * @return Returns an array containing substrings of subject split along boundaries matched by pattern.modifier * @author Nicola Asuni - * @since 6.0.021 + * @since 6.0.022 * @public static */ public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) { diff --git a/tcpdf.php b/tcpdf.php index 1d11d63..fda3114 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.021 + * @version 6.0.022 */ // TCPDF configuration @@ -163,7 +163,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.0.021 + * @version 6.0.022 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -1973,7 +1973,7 @@ class TCPDF { $this->ur['signature'] = '/Modify'; $this->ur['ef'] = '/Create/Delete/Modify/Import'; $this->ur['formex'] = ''; - $this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0'); + $this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0', 'name' => 'Signature'); $this->empty_signature_appearance = array(); // set default JPEG quality $this->jpeg_quality = 75; @@ -2925,9 +2925,8 @@ class TCPDF { public function Error($msg) { // unset all class variables $this->_destroy(true); - $phpmainver = PHP_VERSION; // exit program and print error - if ((intval($phpmainver[0]) < 5) OR !defined('K_TCPDF_THROW_EXCEPTION_ERROR') OR !K_TCPDF_THROW_EXCEPTION_ERROR) { + if (!K_TCPDF_THROW_EXCEPTION_ERROR) { die('TCPDF ERROR: '.$msg); } else { throw new Exception('TCPDF ERROR: '.$msg);