dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea76ba8
)
use consistent URL encoding for Image::thumbUrl() whether hashed directories are...
author
Brion Vibber
<brion@users.mediawiki.org>
Fri, 20 Apr 2007 16:26:12 +0000
(16:26 +0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Fri, 20 Apr 2007 16:26:12 +0000
(16:26 +0000)
includes/Image.php
patch
|
blob
|
history
diff --git
a/includes/Image.php
b/includes/Image.php
index
c6b23ac
..
aefdd73
100644
(file)
--- a/
includes/Image.php
+++ b/
includes/Image.php
@@
-772,13
+772,12
@@
class Image
$path = $wgUploadPath;
}
if ( Image::isHashed( $this->fromSharedDirectory ) ) {
$path = $wgUploadPath;
}
if ( Image::isHashed( $this->fromSharedDirectory ) ) {
- $url = "{$base}{$path}/thumb" .
- wfGetHashPath($this->name, $this->fromSharedDirectory)
- . $this->name.'/'.$thumbName;
- $url = wfUrlencode( $url );
+ $subdir = wfGetHashPath($this->name, $this->fromSharedDirectory) .
+ wfUrlencode( $this->name );
} else {
} else {
- $
url = "{$base}{$path}/thumb/{$thumbName}"
;
+ $
subdir = ''
;
}
}
+ $url = "{$base}{$path}/thumb{$subdir}/" . wfUrlencode( $thumbName );
return $url;
}
return $url;
}