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:
8395a4e
)
Support for non-standard commons configurations
author
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 16 Apr 2005 11:28:15 +0000
(11:28 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 16 Apr 2005 11:28:15 +0000
(11:28 +0000)
includes/Image.php
patch
|
blob
|
history
diff --git
a/includes/Image.php
b/includes/Image.php
index
b2d457f
..
0b5ac62
100644
(file)
--- a/
includes/Image.php
+++ b/
includes/Image.php
@@
-285,10
+285,13
@@
class Image
* Load image metadata from cache or DB, unless already loaded
*/
function load() {
* Load image metadata from cache or DB, unless already loaded
*/
function load() {
+ global $wgSharedUploadDBname, $wgUseSharedUploads;
if ( !$this->dataLoaded ) {
if ( !$this->loadFromCache() ) {
$this->loadFromDB();
if ( !$this->dataLoaded ) {
if ( !$this->loadFromCache() ) {
$this->loadFromDB();
- if ( $this->fileExists ) {
+ if ( !$wgSharedUploadDBname && $wgUseSharedUploads ) {
+ $this->loadFromFile();
+ } elseif ( $this->fileExists ) {
$this->saveToCache();
}
}
$this->saveToCache();
}
}
@@
-1043,12
+1046,21
@@
function wfImageDir( $fname ) {
* @access public
*/
function wfImageThumbDir( $fname, $shared = false ) {
* @access public
*/
function wfImageThumbDir( $fname, $shared = false ) {
- $dir = wfImageArchiveDir( $fname, 'thumb', $shared ) . "/$fname";
+ $base = wfImageArchiveDir( $fname, 'thumb', $shared );
+ $dir = "$base/$fname";
+
+ if ( !is_dir( $base ) ) {
+ $oldumask = umask(0);
+ @mkdir( $base, 0777 );
+ umask( $oldumask );
+ }
+
if ( ! is_dir( $dir ) ) {
$oldumask = umask(0);
@mkdir( $dir, 0777 );
umask( $oldumask );
}
if ( ! is_dir( $dir ) ) {
$oldumask = umask(0);
@mkdir( $dir, 0777 );
umask( $oldumask );
}
+
return $dir;
}
return $dir;
}