joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-25 13:57:33 +00:00
Code Issues Releases Activity

6.2.4 (2015-01-08)

Browse Source 
- fix warning related to empty K_PATH_URL.
- fix error when a  key is not set.
This commit is contained in:
nicolaasuni 2015-01-08 18:35:22 +00:00
parent d7071cbf26
commit ba2afad72c
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -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.

6
README.TXT
View File

@ -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

2
composer.json
View File

@ -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.",

12
include/tcpdf_static.php
View File

@ -1,13 +1,13 @@
<?php
//============================================================+
// File name : tcpdf_static.php
// Version : 1.1.0
// Version : 1.1.1
// Begin : 2002-08-03
// Last Update : 2014-12-10
// Last Update : 2015-01-08
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@ -38,7 +38,7 @@
* This is a PHP class that contains static methods for the TCPDF class.<br>
* @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));

16
tcpdf.php
View File

@ -1,13 +1,13 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 6.2.3
// Version : 6.2.4
// Begin : 2002-08-03
// Last Update : 2014-12-18
// Last Update : 2015-01-08
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@ -104,7 +104,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @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.<br>
* @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']);