From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 extensions/Cite/Cite.php | 52 ++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

(limited to 'extensions/Cite/Cite.php')

diff --git a/extensions/Cite/Cite.php b/extensions/Cite/Cite.php
index 4b2f70ff..bb8ece86 100644
--- a/extensions/Cite/Cite.php
+++ b/extensions/Cite/Cite.php
@@ -18,17 +18,24 @@ if ( ! defined( 'MEDIAWIKI' ) )
  */
 
 $wgHooks['ParserFirstCallInit'][] = 'wfCite';
-$wgHooks['BeforePageDisplay'][] = 'wfCiteBeforePageDisplay';
-
 
 $wgExtensionCredits['parserhook'][] = array(
 	'path' => __FILE__,
 	'name' => 'Cite',
-	'author' => array( 'Ævar Arnfjörð Bjarmason', 'Marius Hoch' ),
+	'author' => array(
+		'Ævar Arnfjörð Bjarmason',
+		'Andrew Garrett',
+		'Brion Vibber',
+		'Marius Hoch',
+		'Steve Sanbeg'
+	),
 	'descriptionmsg' => 'cite-desc',
-	'url' => 'https://www.mediawiki.org/wiki/Extension:Cite/Cite.php'
+	'url' => 'https://www.mediawiki.org/wiki/Extension:Cite/Cite.php',
+	'license-name' => 'GPLv2',
 );
+
 $wgParserTestFiles[] = __DIR__ . "/citeParserTests.txt";
+$wgMessagesDirs['Cite'] = __DIR__ . '/i18n/core';
 $wgExtensionMessagesFiles['Cite'] = __DIR__ . "/Cite.i18n.php";
 $wgAutoloadClasses['Cite'] = __DIR__ . "/Cite_body.php";
 $wgSpecialPageGroups['Cite'] = 'pagetools';
@@ -45,11 +52,6 @@ $wgAllowCiteGroups = true;
  */
 $wgCiteCacheReferences = false;
 
-/**
- * Enables experimental popups
- */
-$wgCiteEnablePopups = false;
-
 /**
  * Performs the hook registration.
  * Note that several extensions (and even core!) try to detect if Cite is
@@ -78,42 +80,10 @@ $wgResourceModules['ext.cite'] = $citeResourceTemplate + array(
 	),
 );
 
-$wgResourceModules['ext.cite.popups'] = $citeResourceTemplate + array(
-	'scripts' => 'ext.cite.popups.js',
-	'position' => 'bottom',
-	'dependencies' => array(
-		'jquery.tooltip',
-	),
-);
-
-$wgResourceModules['jquery.tooltip'] = $citeResourceTemplate + array(
-	'styles' => 'jquery.tooltip/jquery.tooltip.css',
-	'scripts' => 'jquery.tooltip/jquery.tooltip.js',
-	'position' => 'bottom',
-);
-
 /* Add RTL fix for the cite <sup> elements */
 $wgResourceModules['ext.rtlcite'] = $citeResourceTemplate + array(
 	'styles' => 'ext.rtlcite.css',
 	'position' => 'top',
 );
 
-/**
- * @param $out OutputPage
- * @param $sk Skin
- * @return bool
- */
-function wfCiteBeforePageDisplay( $out, &$sk ) {
-	global $wgCiteEnablePopups;
-
-	$out->addModules( 'ext.cite' );
-	if ( $wgCiteEnablePopups ) {
-		$out->addModules( 'ext.cite.popups' );
-	}
-
-	/* RTL support quick-fix module */
-	$out->addModuleStyles( 'ext.rtlcite' );
-	return true;
-}
-
 /**#@-*/
-- 
cgit v1.2.3-54-g00ecf