X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=img_auth.php;h=2f7fb390506c0a764f3de9c68aecbf75137fdde6;hb=212b927746caa8a5e8c7f2aad9ac29d67c5faa59;hp=d7125897c5f9941e629bb361aa961067ec3888ac;hpb=5446238520cceb067792338cdfc83a343b480e15;p=lhc%2Fweb%2Fwiklou.git

diff --git a/img_auth.php b/img_auth.php
index d7125897c5..2f7fb39050 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -43,12 +43,12 @@ define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'core/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 wfProfileIn( 'img_auth.php' );
 
 # Set action base paths so that WebRequest::getPathInfo()
-# recognizes the "X" as the 'title' in ../image_auth/X urls.
+# recognizes the "X" as the 'title' in ../img_auth.php/X urls.
 $wgArticlePath = false; # Don't let a "/*" article path clober our action path
 $wgActionPaths = array( "$wgUploadPath/" );
 
@@ -106,7 +106,7 @@ function wfImageAuthMain() {
 
 	// Check to see if the file exists
 	if ( !$repo->fileExists( $filename ) ) {
-		wfForbidden( 'img-auth-accessdenied','img-auth-nofile', $filename );
+		wfForbidden( 'img-auth-accessdenied', 'img-auth-nofile', $filename );
 		return;
 	}
 
@@ -148,13 +148,13 @@ function wfForbidden( $msg1, $msg2 ) {
 	array_shift( $args );
 	array_shift( $args );
 
-	$msgHdr = htmlspecialchars( wfMsg( $msg1 ) );
+	$msgHdr = wfMessage( $msg1 )->escaped();
 	$detailMsgKey = $wgImgAuthDetails ? $msg2 : 'badaccess-group0';
-	$detailMsg = htmlspecialchars( wfMsg( $detailMsgKey, $args ) );
+	$detailMsg = wfMessage( $detailMsgKey, $args )->escaped();
 
 	wfDebugLog( 'img_auth',
-		"wfForbidden Hdr:" . wfMsgExt( $msg1, array( 'language' => 'en' ) ). " Msg: ".
-		wfMsgExt( $msg2, array( 'language' => 'en' ), $args )
+		"wfForbidden Hdr:" . wfMessage( $msg1 )->inLanguage( 'en' )->text() . " Msg: ".
+		wfMessage( $msg2, $args )->inLanguage( 'en' )->text()
 	);
 
 	header( 'HTTP/1.0 403 Forbidden' );