diff --git a/libraries/tcpdf/README.TXT b/libraries/tcpdf/README.TXT index 51accdc4dc..e271017554 100644 --- a/libraries/tcpdf/README.TXT +++ b/libraries/tcpdf/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.204 -Release date: 2013-01-30 +Version: 5.9.205 +Release date: 2013-02-06 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/libraries/tcpdf/config/tcpdf_config.php b/libraries/tcpdf/config/tcpdf_config.php index e47e5c81c4..f5c0a182bb 100644 --- a/libraries/tcpdf/config/tcpdf_config.php +++ b/libraries/tcpdf/config/tcpdf_config.php @@ -2,13 +2,13 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2013-01-28 +// Last Update : 2013-02-06 // // Description : Configuration file for TCPDF. // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2004-2012 Nicola Asuni - Tecnick.com LTD +// Copyright (C) 2004-2013 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // @@ -246,6 +246,11 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { * IMPORTANT: For security reason, disable this feature if you are printing user HTML content. */ define('K_TCPDF_CALLS_IN_HTML', true); + + /** + * if true adn PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution. + */ + define('K_TCPDF_THROW_EXCEPTION_ERROR', false); } //============================================================+ diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php index 4413cf5363..0ac75d70e9 100644 --- a/libraries/tcpdf/tcpdf.php +++ b/libraries/tcpdf/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.204 + * @version 5.9.205 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -151,7 +151,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.204 + * @version 5.9.205 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -162,7 +162,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.204'; + private $tcpdf_version = '5.9.205'; // Protected properties @@ -3844,7 +3844,7 @@ class TCPDF { $this->_destroy(true); $phpmainver = PHP_VERSION; // exit program and print error - if (intval($phpmainver[0]) < 5) { + if ((intval($phpmainver[0]) < 5) OR !defined('K_TCPDF_THROW_EXCEPTION_ERROR') OR !K_TCPDF_THROW_EXCEPTION_ERROR) { die('TCPDF ERROR: '.$msg); } else { throw new Exception('TCPDF ERROR: '.$msg);