Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed check for old cache values in commons, and some other stuff

Browse source
This commit is contained in:
Tim Starling 2005-05-28 06:57:59 +00:00
parent e17e30eaee
commit 42399f8c91
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/Image.php
View file

@ -119,7 +119,7 @@ class Image
# in shared repository has not changed
if ( isset( $keys[1] ) ) {
$commonsCachedValues = $wgMemc->get( $keys[1] );
if (!empty($commonsCachedValues) && is_array($commonsCachedValues) && isset($commonsCachedValues['width'])) {
if (!empty($commonsCachedValues) && is_array($commonsCachedValues) && isset($commonsCachedValues['mime'])) {
$this->name = $commonsCachedValues['name'];
$this->imagePath = $commonsCachedValues['imagePath'];
$this->fileExists = $commonsCachedValues['fileExists'];
@ -309,7 +309,9 @@ class Image
$name = $wgLang->ucfirst($this->name);
$row = $dbr->selectRow( "`$wgSharedUploadDBname`.image",
array( 'img_size', 'img_width', 'img_height', 'img_bits', 'img_media_type', 'img_major_mime', 'img_minor_mime' ),
array(
'img_size', 'img_width', 'img_height', 'img_bits',
'img_media_type', 'img_major_mime', 'img_minor_mime', 'img_metadata' ),
array( 'img_name' => $name ), $fname );
if ( $row ) {
$this->fromSharedDirectory = true;
@ -338,6 +340,7 @@ class Image
# Unconditionally set loaded=true, we don't want the accessors constantly rechecking
$this->dataLoaded = true;
wfProfileOut( $fname );
}
/*
@ -390,11 +393,14 @@ class Image
function upgradeRow() {
global $wgDBname, $wgSharedUploadDBname;
$fname = 'Image::upgradeRow';
wfProfileIn( $fname );
$this->loadFromFile();
$dbw =& wfGetDB( DB_MASTER );
if ( $this->fromSharedDirectory ) {
if ( !$wgSharedUploadDBname ) {
wfProfileOut( $fname );
return;
}
@ -429,6 +435,7 @@ class Image
if ( $this->fromSharedDirectory ) {
$dbw->selectDB( $wgDBname );
}
wfProfileOut( $fname );
}
/**
@ -1125,7 +1132,7 @@ class Image
|| !$db->fieldExists( 'image', 'img_metadata' )
|| !$db->fieldExists( 'image', 'img_width' ) ) {
wfDebugDieBacktrace( 'Database schema not up to date, please run maintenance/updater.php' );
wfDebugDieBacktrace( 'Database schema not up to date, please run maintenance/update.php' );
}
}