From 7632e4a26fc0eca51a3b2aa9fa726954f858ceb1 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 4 Jan 2012 21:30:06 +0000
Subject: [PATCH] * (bug 33525) clearTagHooks doesn't clear function hooks. *
 (bug 33523) Function tag hooks don't appear on Special:Version.

Patches by Nikola Kovacs
---
 CREDITS                    | 1 +
 RELEASE-NOTES-1.19         | 2 ++
 includes/parser/Parser.php | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index fc3949ef43..2e4c7fff00 100644
--- a/CREDITS
+++ b/CREDITS
@@ -150,6 +150,7 @@ following names for their contribution to the product.
 * nephele
 * Nik
 * Nx.devnull
+* Nikola Kovacs
 * Nikolaos S. Karastathis
 * Olaf Lenz
 * Olivier Finlay Beaton
diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index b80b52e0d2..54b2525ed4 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -216,6 +216,8 @@ production.
   HTTPS when the local wiki is served over HTTPS
 * (bug 33482) - Api incorrectly calls ApiBase::parseMultiValue if allowed
   values is given as an array
+* (bug 33525) clearTagHooks doesn't clear function hooks.
+* (bug 33523) Function tag hooks don't appear on Special:Version.
 
 === API changes in 1.19 ===
 * (bug 19838) siprop=interwikimap can now use the interwiki cache.
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 2faf860893..99e934bef5 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4613,6 +4613,7 @@ class Parser {
 	 */
 	function clearTagHooks() {
 		$this->mTagHooks = array();
+		$this->mFunctionTagHooks = array();
 		$this->mStripList = $this->mDefaultStripList;
 	}
 
@@ -5154,7 +5155,7 @@ class Parser {
 	 * @return array
 	 */
 	function getTags() {
-		return array_merge( array_keys( $this->mTransparentTagHooks ), array_keys( $this->mTagHooks ) );
+		return array_merge( array_keys( $this->mTransparentTagHooks ), array_keys( $this->mTagHooks ), array_keys( $this->mFunctionTagHooks ) );
 	}
 
 	/**
-- 
2.20.1