From: Erik Moeller Date: Sat, 30 Oct 2004 12:20:34 +0000 (+0000) Subject: bugfix X-Git-Tag: 1.5.0alpha1~1415 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=ca8ef41fbb6ed9ad8e41bca16ff8ea205ea6c683;p=lhc%2Fweb%2Fwiklou.git bugfix --- diff --git a/includes/Image.php b/includes/Image.php index 5ea525d394..8aafff6af4 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -78,9 +78,10 @@ class Image } $this->fileExists = file_exists( $this->imagePath); $this->fromSharedDirectory = true; + $name=$sharedname; } - if($this->fileExists) { - $this->url = $this->wfImageUrl( $sharedname, $this->fromSharedDirectory ); + if($this->fileExists) { + $this->url = $this->wfImageUrl( $name, $this->fromSharedDirectory ); } else { $this->url=''; } @@ -245,8 +246,7 @@ class Image function wfImageUrl( $name, $fromSharedDirectory = false ) { global $wgUploadPath,$wgUploadBaseUrl,$wgHashedUploadDirectory, - $wgHashedSharedUploadDirectory,$wgSharedUploadPath, - $wgUseLatin1, $wgSharedLatin1; + $wgHashedSharedUploadDirectory,$wgSharedUploadPath; if($fromSharedDirectory) { $hash = $wgHashedSharedUploadDirectory; $base = '';