| Index: trunk/extensions/Translate/Groups.php |
| — | — | @@ -337,9 +337,11 @@ |
| 338 | 338 | |
| 339 | 339 | public function load( $code ) { |
| 340 | 340 | $messages = array(); |
| | 341 | + |
| 341 | 342 | foreach( $this->getGroups() as $group ) { |
| 342 | 343 | $messages += $group->load( $code ); |
| 343 | 344 | } |
| | 345 | + |
| 344 | 346 | return $messages; |
| 345 | 347 | } |
| 346 | 348 | |
| — | — | @@ -354,9 +356,13 @@ |
| 355 | 357 | if ( !isset( $this->groups ) ) { |
| 356 | 358 | $groups = array(); |
| 357 | 359 | $ids = (array) $this->conf['GROUPS']; |
| | 360 | + |
| 358 | 361 | foreach( $ids as $id ) { |
| 359 | 362 | // Don't try to include self and go to infinite loop |
| 360 | | - if ( $id === $this->getId() ) continue; |
| | 363 | + if ( $id === $this->getId() ) { |
| | 364 | + continue; |
| | 365 | + } |
| | 366 | + |
| 361 | 367 | $groups[$id] = MessageGroups::getGroup( $id ); |
| 362 | 368 | } |
| 363 | 369 | $this->groups = $groups; |
| — | — | @@ -402,5 +408,4 @@ |
| 403 | 409 | $group->setTags( $collection ); |
| 404 | 410 | } |
| 405 | 411 | } |
| 406 | | - |
| 407 | | -} |
| \ No newline at end of file |
| | 412 | +} |