From 3cc813813336520157643273e63837ea3883a8cc Mon Sep 17 00:00:00 2001
From: Stephan Hradek <github.mails.skeeve@xoxy.net>
Date: Sun, 29 Dec 2013 23:57:42 +0100
Subject: [PATCH] fixed issue #314 - fix for > at end of line

---
 core/modules/parsers/wikiparser/rules/table.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/modules/parsers/wikiparser/rules/table.js b/core/modules/parsers/wikiparser/rules/table.js
index 57e1f9cad..9a894d81e 100644
--- a/core/modules/parsers/wikiparser/rules/table.js
+++ b/core/modules/parsers/wikiparser/rules/table.js
@@ -64,6 +64,11 @@ var processRow = function(prevColumns) {
 		} else if(cellMatch[2]) {
 			// End of row
 			if(prevCell && colSpanCount > 1) {
+				try {
+					colSpanCount+= prevCell.attributes.colspan.value;
+				} catch (e) {
+					colSpanCount-= 1;
+				}
 				$tw.utils.addAttributeToParseTreeNode(prevCell,"colspan",colSpanCount);
 			}
 			this.parser.pos = cellRegExp.lastIndex - 1;