From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 extensions/Cite/Cite.php | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

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

diff --git a/extensions/Cite/Cite.php b/extensions/Cite/Cite.php
index 0f957659..045bb8cc 100644
--- a/extensions/Cite/Cite.php
+++ b/extensions/Cite/Cite.php
@@ -18,20 +18,17 @@ if ( ! defined( 'MEDIAWIKI' ) )
  */
 
 $wgHooks['ParserFirstCallInit'][] = 'wfCite';
-$wgHooks['BeforePageDisplay'][] = 'wfCiteBeforePageDisplay';
-
 
 $wgExtensionCredits['parserhook'][] = array(
 	'path' => __FILE__,
 	'name' => 'Cite',
-	'author' => 'Ævar Arnfjörð Bjarmason',
+	'author' => array( 'Ævar Arnfjörð Bjarmason', 'Marius Hoch' ),
 	'descriptionmsg' => 'cite-desc',
 	'url' => 'https://www.mediawiki.org/wiki/Extension:Cite/Cite.php'
 );
-$wgParserTestFiles[] = dirname( __FILE__ ) . "/citeParserTests.txt";
-$wgParserTestFiles[] = dirname( __FILE__ ) . "/citeCatTreeParserTests.txt";
-$wgExtensionMessagesFiles['Cite'] = dirname( __FILE__ ) . "/Cite.i18n.php";
-$wgAutoloadClasses['Cite'] = dirname( __FILE__ ) . "/Cite_body.php";
+$wgParserTestFiles[] = __DIR__ . "/citeParserTests.txt";
+$wgExtensionMessagesFiles['Cite'] = __DIR__ . "/Cite.i18n.php";
+$wgAutoloadClasses['Cite'] = __DIR__ . "/Cite_body.php";
 $wgSpecialPageGroups['Cite'] = 'pagetools';
 
 define( 'CITE_DEFAULT_GROUP', '' );
@@ -66,13 +63,21 @@ function wfCite( $parser ) {
 
 // Resources
 $citeResourceTemplate = array(
-	'localBasePath' => dirname(__FILE__) . '/modules',
+	'localBasePath' => __DIR__ . '/modules',
 	'remoteExtPath' => 'Cite/modules'
 );
 
 $wgResourceModules['ext.cite'] = $citeResourceTemplate + array(
-	'styles' => array(),
-	'scripts' => 'ext.cite/ext.cite.js',
+	'scripts' => 'ext.cite.js',
+	'styles' => 'ext.cite.css',
+	'messages' => array(
+		'cite_references_link_accessibility_label',
+		'cite_references_link_many_accessibility_label',
+	),
+);
+
+$wgResourceModules['ext.cite.popups'] = $citeResourceTemplate + array(
+	'scripts' => 'ext.cite.popups.js',
 	'position' => 'bottom',
 	'dependencies' => array(
 		'jquery.tooltip',
@@ -87,25 +92,8 @@ $wgResourceModules['jquery.tooltip'] = $citeResourceTemplate + array(
 
 /* Add RTL fix for the cite <sup> elements */
 $wgResourceModules['ext.rtlcite'] = $citeResourceTemplate + array(
-	'styles' => 'ext.rtlcite/ext.rtlcite.css',
+	'styles' => 'ext.rtlcite.css',
 	'position' => 'top',
 );
 
-/**
- * @param $out OutputPage
- * @param $sk Skin
- * @return bool
- */
-function wfCiteBeforePageDisplay( $out, &$sk ) {
-	global $wgCiteEnablePopups;
-
-	if ( $wgCiteEnablePopups ) {
-		$out->addModules( 'ext.cite' );
-	}
-
-	/* RTL support quick-fix module */
-	$out->addModuleStyles( 'ext.rtlcite' );
-	return true;
-}
-
 /**#@-*/
-- 
cgit v1.2.3-54-g00ecf