From f2752c7fc0bc0e8690b175262610c5515d5fb2a1 Mon Sep 17 00:00:00 2001
From: Jens Frank <jeluf@users.mediawiki.org>
Date: Thu, 13 May 2004 19:47:09 +0000
Subject: [PATCH] Repaired rendering of ''emph ''' bold emph '' bold ''' to
 produce valid HTML.

---
 includes/Parser.php    | 8 ++++----
 includes/Tokenizer.php | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/Parser.php b/includes/Parser.php
index b0b869a093..2f9b9cca37 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -688,7 +688,7 @@ class Parser
 			$state["strong"] = FALSE;
 		} else {
 			$s = "<strong>";
-			$state["strong"] = isset($token["pos"]) ? $token["pos"] : true;
+			$state["strong"] = $token["pos"];
 		}
 		return $s;
 	}
@@ -706,7 +706,7 @@ class Parser
 			$state["em"] = FALSE;
 		} else {
 			$s = "<em>";
-			$state["em"] = isset($token["pos"]) ? $token["pos"] : true;
+			$state["em"] = $token["pos"];
 
 		}
 		return $s;
@@ -729,10 +729,10 @@ class Parser
 		} elseif ( $state["strong"] !== false ) {
 			$s .= "</strong><em>";
 			$state["strong"] = FALSE;
-			$state["em"] = @$token["pos"];
+			$state["em"] = $token["pos"];
 		} else { # not $em and not $strong
 			$s .= "<strong><em>";
-			$state["strong"] = $state["em"] = isset($token["pos"]) ? $token["pos"] : true;
+			$state["strong"] = $state["em"] = $token["pos"];
 		}
 		return $s;
 	}
diff --git a/includes/Tokenizer.php b/includes/Tokenizer.php
index 2c61c6574c..0b313d5e26 100644
--- a/includes/Tokenizer.php
+++ b/includes/Tokenizer.php
@@ -137,6 +137,7 @@ class Tokenizer {
 							       && $this->mText[$this->mPos+1] == "'" )
 							{
 								$queueToken["type"] .= "'";
+								$queueToken["pos"] = $this->mPos;
 								$this->mPos ++;
 							}
 							
-- 
2.20.1