Add missing group cond to query
authorAaron Schulz <aaron@users.mediawiki.org>
Fri, 20 Mar 2009 20:39:13 +0000 (20:39 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Fri, 20 Mar 2009 20:39:13 +0000 (20:39 +0000)
includes/filerepo/ArchivedFile.php

index 3919cfb..68c93b8 100644 (file)
@@ -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 ) {