| Index: branches/REL1_14/phase3/includes/filerepo/ArchivedFile.php |
| — | — | @@ -74,14 +74,16 @@ |
| 75 | 75 | } |
| 76 | 76 | $conds = array(); |
| 77 | 77 | |
| 78 | | - if ($this->id>0) |
| | 78 | + if( $this->id > 0 ) |
| 79 | 79 | $conds['fa_id'] = $this->id; |
| 80 | | - if ($this->key) |
| 81 | | - $conds['fa_storage_key'] = $this->key; |
| 82 | | - if ($this->title) |
| | 80 | + if( $this->key ) { |
| | 81 | + $conds['fa_storage_group'] = $this->group; |
| | 82 | + $conds['fa_storage_key'] = $this->key; |
| | 83 | + } |
| | 84 | + if( $this->title ) |
| 83 | 85 | $conds['fa_name'] = $this->title->getDBkey(); |
| 84 | 86 | |
| 85 | | - if (!count($conds)) |
| | 87 | + if( !count($conds)) |
| 86 | 88 | throw new MWException( "No specific information for retrieving archived file" ); |
| 87 | 89 | |
| 88 | 90 | if( !$this->title || $this->title->getNamespace() == NS_FILE ) { |