From 72e90545454c0e014318fa3c81658e035aac58c1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 10 Jun 2009 13:00:47 +0200 Subject: applying patch to version 1.15.0 --- includes/filerepo/ArchivedFile.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'includes/filerepo/ArchivedFile.php') diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php index 3919cfbc..68c93b8f 100644 --- a/includes/filerepo/ArchivedFile.php +++ b/includes/filerepo/ArchivedFile.php @@ -74,14 +74,16 @@ class ArchivedFile } $conds = array(); - if ($this->id>0) + if( $this->id > 0 ) $conds['fa_id'] = $this->id; - if ($this->key) - $conds['fa_storage_key'] = $this->key; - if ($this->title) + if( $this->key ) { + $conds['fa_storage_group'] = $this->group; + $conds['fa_storage_key'] = $this->key; + } + if( $this->title ) $conds['fa_name'] = $this->title->getDBkey(); - if (!count($conds)) + if( !count($conds)) throw new MWException( "No specific information for retrieving archived file" ); if( !$this->title || $this->title->getNamespace() == NS_FILE ) { -- cgit v1.2.3-54-g00ecf