From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 maintenance/hiphop/make       | 6 +++---
 maintenance/hiphop/run-server | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'maintenance/hiphop')

diff --git a/maintenance/hiphop/make b/maintenance/hiphop/make
index 2bb9951f..2fa70dcb 100644
--- a/maintenance/hiphop/make
+++ b/maintenance/hiphop/make
@@ -2,7 +2,7 @@
 <?php
 
 define( 'MW_CONFIG_CALLBACK', 'MakeHipHop::noConfigNeeded' );
-require( dirname( __FILE__ ) . '/../Maintenance.php' );
+require( __DIR__ . '/../Maintenance.php' );
 
 class MakeHipHop extends Maintenance {
 	function noConfigNeeded() {}
@@ -12,7 +12,7 @@ class MakeHipHop extends Maintenance {
 
 		$startTime = time();
 
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		if ( strval( $wgHipHopBuildDirectory ) !== '' ) {
 			$buildDir = $wgHipHopBuildDirectory;
@@ -278,7 +278,7 @@ class MakeHipHop extends Maintenance {
 			}
 		}
 
-		$extraCoreFiles = array_map( 'trim', file( dirname( __FILE__ ) . '/extra-files' ) );
+		$extraCoreFiles = array_map( 'trim', file( __DIR__ . '/extra-files' ) );
 		foreach ( $extraCoreFiles as $file ) {
 			if ( $file === '' ) {
 				continue;
diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server
index 0ad43134..1c4b51f4 100644
--- a/maintenance/hiphop/run-server
+++ b/maintenance/hiphop/run-server
@@ -1,7 +1,7 @@
 #!/usr/bin/hphpi -f
 <?php
 
-require( dirname( __FILE__ ) . '/../Maintenance.php' );
+require( __DIR__ . '/../Maintenance.php' );
 
 class RunHipHopServer extends Maintenance {
 	function __construct() {
@@ -19,7 +19,7 @@ class RunHipHopServer extends Maintenance {
 
 	function runCompiled() {
 		global $wgHipHopBuildDirectory;
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		if ( strval( $wgHipHopBuildDirectory ) !== '' ) {
 			$buildDir = $wgHipHopBuildDirectory;
@@ -51,7 +51,7 @@ class RunHipHopServer extends Maintenance {
 	}
 
 	function runInterpreted() {
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		$sourceBase = realpath( "$IP/.." );
 
-- 
cgit v1.2.2