| Index: trunk/phase3/includes/LocalisationCache.php |
| — | — | @@ -218,20 +218,18 @@ |
| 219 | 219 | if ( isset( $this->legacyData[$code][$key][$subkey] ) ) { |
| 220 | 220 | return $this->legacyData[$code][$key][$subkey]; |
| 221 | 221 | } |
| 222 | | - if ( !isset( $this->loadedSubitems[$code][$key][$subkey] ) ) { |
| 223 | | - if ( isset( $this->loadedItems[$code][$key] ) ) { |
| 224 | | - if ( isset( $this->data[$code][$key][$subkey] ) ) { |
| 225 | | - return $this->data[$code][$key][$subkey]; |
| 226 | | - } else { |
| 227 | | - return null; |
| 228 | | - } |
| 229 | | - } else { |
| 230 | | - wfProfileIn( __METHOD__.'-load' ); |
| 231 | | - $this->loadSubitem( $code, $key, $subkey ); |
| 232 | | - wfProfileOut( __METHOD__.'-load' ); |
| 233 | | - } |
| | 222 | + if ( !isset( $this->loadedSubitems[$code][$key][$subkey] ) |
| | 223 | + && !isset( $this->loadedItems[$code][$key] ) ) |
| | 224 | + { |
| | 225 | + wfProfileIn( __METHOD__.'-load' ); |
| | 226 | + $this->loadSubitem( $code, $key, $subkey ); |
| | 227 | + wfProfileOut( __METHOD__.'-load' ); |
| 234 | 228 | } |
| 235 | | - return $this->data[$code][$key][$subkey]; |
| | 229 | + if ( isset( $this->data[$code][$key][$subkey] ) ) { |
| | 230 | + return $this->data[$code][$key][$subkey]; |
| | 231 | + } else { |
| | 232 | + return null; |
| | 233 | + } |
| 236 | 234 | } |
| 237 | 235 | |
| 238 | 236 | /** |