Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 11 insertions, 3 deletions

diff --git a/extensions/InputBox/InputBox.php b/extensions/InputBox/InputBox.php
index b54baa36..d5215efa 100644
--- a/extensions/InputBox/InputBox.php
+++ b/extensions/InputBox/InputBox.php
@@ -22,7 +22,7 @@
 
 // Check environment
 if ( !defined( 'MEDIAWIKI' ) ) {
-	echo( "This is an extension to the MediaWiki package and cannot be run standalone.\n" );
+	echo "This is an extension to the MediaWiki package and cannot be run standalone.\n";
 	die( -1 );
 }
 
@@ -33,16 +33,17 @@ $wgExtensionCredits['parserhook'][] = array(
 	'path'           => __FILE__,
 	'name'           => 'InputBox',
 	'author'         => array( 'Erik Moeller', 'Leonardo Pimenta', 'Rob Church', 'Trevor Parscal', 'DaSch' ),
-	'version'        => '0.1.4',
+	'version'        => '0.2.0',
 	'url'            => 'https://www.mediawiki.org/wiki/Extension:InputBox',
 	'description'    => 'Allow inclusion of predefined HTML forms.',
 	'descriptionmsg' => 'inputbox-desc',
 );
 
 // Shortcut to this extension directory
-$dir = dirname( __FILE__ ) . '/';
+$dir = __DIR__ . '/';
 
 // Internationalization
+$wgMessagesDirs['InputBox'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['InputBox'] = $dir . 'InputBox.i18n.php';
 
 // Register auto load for the special page class
@@ -52,3 +53,10 @@ $wgAutoloadClasses['InputBox'] = $dir . 'InputBox.classes.php';
 // Register parser hook
 $wgHooks['ParserFirstCallInit'][] = 'InputBoxHooks::register';
 $wgHooks['MediaWikiPerformAction'][] = 'InputBoxHooks::onMediaWikiPerformAction';
+$wgHooks['SpecialPageBeforeExecute'][] = 'InputBoxHooks::onSpecialPageBeforeExecute';
+
+$wgResourceModules['ext.inputBox.styles'] = array(
+	'localBasePath' => dirname( __FILE__ ) . '/resources',
+	'remoteExtPath' => 'InputBox/resources',
+	'styles' => 'ext.inputBox.styles.css',
+);