From abf6392d3627391213288aa7724d01ba9af65e24 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 8 Oct 2005 11:14:16 +0000
Subject: [PATCH] Fixed interwiki dump links

---
 includes/Title.php | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/includes/Title.php b/includes/Title.php
index 7c94ef4798..4a0767787d 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -664,8 +664,13 @@ class Title {
 		if ( '' == $this->mInterwiki ) {
 			return $wgServer . $this->getLocalUrl( $query );
 		} elseif ( $wgMakeDumpLinks && $wgContLang->getLanguageName( $this->mInterwiki ) ) {
-			$baseUrl = str_replace( '$1', "../../{$this->mInterwiki}/$1", $wgArticlePath );
-			$baseUrl = str_replace( '$1', $this->getHashedDirectory() . '/$1', $baseUrl );
+			if ( $this->getDBkey() == '' ) {
+				$url = str_replace( '$1', "../{$this->mInterwiki}/index.html", $wgArticlePath );
+			} else {
+				$url = str_replace( '$1', "../{$this->mInterwiki}/" . $this->getHashedFilename() , 
+					$wgArticlePath );
+			}
+			return $url;
 		} else {
 			$baseUrl = $this->getInterwikiLink( $this->mInterwiki );
 		}
@@ -695,35 +700,45 @@ class Title {
 	 */
 	function getHashedDirectory() {
 		global $wgMakeDumpLinks, $wgInputEncoding;
-		$dbkey = $this->getDBkey();
+		if ( '' != $this->mInterwiki ) {
+			$pdbk = $this->mDbkeyform;
+		} else {
+			$pdbk = $this->getPrefixedDBkey();
+		}
 
 		# Split into characters
 		if ( $wgInputEncoding == 'UTF-8' ) {
-			preg_match_all( '/./us', $dbkey, $m );
+			preg_match_all( '/./us', $pdbk, $m );
 		} else {
-			preg_match_all( '/./s', $dbkey, $m );
+			preg_match_all( '/./s', $pdbk, $m );
 		}
 		$chars = $m[0];
 		$length = count( $chars );
 		$dir = '';
 
 		for ( $i = 0; $i < $wgMakeDumpLinks; $i++ ) {
+			$c = $chars[$i];
 			if ( $i ) {
 				$dir .= '/';
 			}
 			if ( $i >= $length ) {
 				$dir .= '_';
-			} elseif ( ord( $chars[$i] ) > 32 ) {
-				$dir .= strtolower( $chars[$i] );
+			} elseif ( ord( $c ) >= 128 || ctype_alnum( $c ) ) {
+				$dir .= strtolower( $c );
 			} else {
-				$dir .= sprintf( "%02X", ord( $chars[$i] ) );
+				$dir .= sprintf( "%02X", ord( $c ) );
 			}
 		}
 		return $dir;
 	}
 
 	function getHashedFilename() {
-		$dbkey = $this->getPrefixedDBkey();
+		if ( '' != $this->mInterwiki ) {
+			$dbkey = $this->getDBkey();
+		} else {
+			$dbkey = $this->getPrefixedDBkey();
+		}
+
 		$mainPage = Title::newMainPage();
 		if ( $mainPage->getPrefixedDBkey() == $dbkey ) {
 			return 'index.html';
@@ -736,7 +751,7 @@ class Title {
 
 		# Work out lower case form. We assume we're on a system with case-insensitive
 		# filenames, so unless the case is of a special form, we have to disambiguate
-		$lowerCase = $this->prefix( ucfirst( strtolower( $this->getDBkey() ) ) );
+		$lowerCase = ucfirst( strtolower( $dbkey ) );
 
 		# Make it mostly unique
 		if ( $lowerCase != $friendlyName  ) {
-- 
2.20.1