From d75c9d3f47b8375be906e9b15ac5fa3cd3640aa7 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 20 Mar 2009 20:39:13 +0000 Subject: [PATCH] Add missing group cond to query --- includes/filerepo/ArchivedFile.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php index 3919cfbcf1..68c93b8f5d 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 ) { -- 2.20.1