From e39014a3a765f7afb189be5409b60a771f5c46da Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 15 May 2012 17:18:46 -0700
Subject: update tinymce to 3.5.0.1

---
 library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js')

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
index d6f329059..02ecf22c8 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
@@ -137,7 +137,7 @@ function updateAction() {
 			do {
 				if (cell == tdElm)
 					break;
-				col += cell.getAttribute("colspan");
+				col += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
 			} while ((cell = nextCell(cell)) != null);
 
 			for (var i=0; i<rows.length; i++) {
@@ -152,7 +152,7 @@ function updateAction() {
 						cell = updateCell(cell, true);
 						break;
 					}
-					curr += cell.getAttribute("colspan");
+					curr += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
 				} while ((cell = nextCell(cell)) != null);
 			}
 
-- 
cgit v1.2.3