Index: branches/wmf/1.17wmf1/extensions/SubPageList3/SubPageList3.php |
— | — | @@ -504,7 +504,7 @@ |
505 | 505 | wfProfileIn( __METHOD__ ); |
506 | 506 | $output = $this->parser->recursiveTagParse( $text ); |
507 | 507 | wfProfileOut( __METHOD__ ); |
508 | | - return $output->getText(); |
| 508 | + return $output; |
509 | 509 | } |
510 | 510 | |
511 | 511 | } |
Property changes on: branches/wmf/1.17wmf1/extensions/SubPageList3/SubPageList3.php |
___________________________________________________________________ |
Added: svn:mergeinfo |
512 | 512 | Merged /branches/wmf/1.16wmf4/extensions/SubPageList3/SubPageList3.php:r67177,69199,76243,77266 |
513 | 513 | Merged /trunk/extensions/SubPageList3/SubPageList3.php:r90653,90658 |
514 | 514 | Merged /branches/sqlite/extensions/SubPageList3/SubPageList3.php:r58211-58321 |
515 | 515 | Merged /trunk/phase3/extensions/SubPageList3/SubPageList3.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590 |
516 | 516 | Merged /branches/new-installer/phase3/extensions/SubPageList3/SubPageList3.php:r43664-66004 |
517 | 517 | Merged /branches/wmf-deployment/extensions/SubPageList3/SubPageList3.php:r60970 |
518 | 518 | Merged /branches/REL1_15/phase3/extensions/SubPageList3/SubPageList3.php:r51646 |