From 89d007897e20471d4990d4bd0456272dece03a26 Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Tue, 30 Sep 2014 18:01:15 +0100
Subject: [PATCH] 6.0.094 (2014-09-30) - Bug item #978 "Variable Undefined: "
 was fixed.

---
 CHANGELOG.TXT            |  3 +++
 README.TXT               |  4 ++--
 composer.json            |  2 +-
 include/tcpdf_static.php |  2 +-
 tcpdf.php                | 10 +++++-----
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a7dde3f..c3c91a0 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.0.094 (2014-09-30)
+	- Bug item #978 "Variable Undefined: $cborder" was fixed.
+
 6.0.093 (2014-09-02)
 	- Security fix: some serialize/unserialize methods were replaced with json_encode/json_decode to avoid a potential object injection with user supplied content. Thanks to ownCloud Inc. for reporting this issue.
 	- K_TIMEZONE constant was added to the default configuration to supress date-time warnings.
diff --git a/README.TXT b/README.TXT
index 6d279ee..0a7f054 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.093
-Release date: 2014-09-02
+Version: 6.0.094
+Release date: 2014-09-30
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index 4310754..b70c775 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.093",
+	"version": "6.0.094",
 	"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 e657446..2c32f89 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.093';
+	private static $tcpdf_version = '6.0.094';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 78694a0..ca91d37 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.0.093
+// Version     : 6.0.094
 // Begin       : 2002-08-03
-// Last Update : 2014-09-02
+// Last Update : 2014-09-30
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -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.0.093
+ * @version 6.0.094
  */
 
 // 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.0.093
+ * @version 6.0.094
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
@@ -19768,7 +19768,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
 								} // end for each column
 							}
-							if ($cborder OR $fill) {
+							if (!empty($cborder) OR !empty($fill)) {
 								$offsetlen = strlen($ccode);
 								// draw border and fill
 								if ($this->inxobj) {