From 6af1a3d25efc89c84053691f3f159f0265e1314b Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 26 Nov 2009 20:19:09 +0000
Subject: [PATCH] * (bug 21650) Both calls to SkinTemplateTabs hook are now
 compatible

---
 RELEASE-NOTES             | 1 +
 includes/SkinTemplate.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a80d5d92db..feb8703085 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -646,6 +646,7 @@ Hopefully we will remove this configuration var soon)
   of the displayed page
 * (bug 21403) memcached class renamed to MWMemecached to avoid conflict with
   PHP's memcached extension
+* (bug 21650) Both calls to SkinTemplateTabs hook are now compatible
 
 == API changes in 1.16 ==
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 11fb418fc2..e88b84e1fd 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -859,7 +859,7 @@ class SkinTemplate extends Skin {
 			}
 
 
-			wfRunHooks( 'SkinTemplateTabs', array( &$this, &$content_actions ) );
+			wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
 		} else {
 			/* show special page tab */
 
-- 
2.20.1