MediaWiki 1.15.0

[autoinstallsdev/mediawiki.git] / includes / filerepo / ArchivedFile.php

diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index 3919cfbcf137d94e837352c160c64c8e2b7636e6..68c93b8f5d918dba3f833211a3ad0a7524c957d2 100644 (file)
--- 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 ) {