| Index: branches/REL1_5/phase3/includes/SkinTemplate.php |
| — | — | @@ -225,7 +225,7 @@ |
| 226 | 226 | $tpl->setRef( 'jsmimetype', $wgJsMimeType ); |
| 227 | 227 | $tpl->setRef( 'charset', $wgOutputEncoding ); |
| 228 | 228 | $tpl->set( 'headlinks', $out->getHeadLinks() ); |
| 229 | | - $tpl->setRef('headscripts', $out->getScript() ); |
| | 229 | + $tpl->set('headscripts', $out->getScript() ); |
| 230 | 230 | $tpl->setRef( 'wgScript', $wgScript ); |
| 231 | 231 | $tpl->setRef( 'skinname', $this->skinname ); |
| 232 | 232 | $tpl->setRef( 'stylename', $this->stylename ); |
| Index: branches/REL1_5/phase3/includes/Database.php |
| — | — | @@ -1472,7 +1472,7 @@ |
| 1473 | 1473 | /** |
| 1474 | 1474 | * @todo document |
| 1475 | 1475 | */ |
| 1476 | | - function resultObject( &$result ) { |
| | 1476 | + function resultObject( $result ) { |
| 1477 | 1477 | if( empty( $result ) ) { |
| 1478 | 1478 | return NULL; |
| 1479 | 1479 | } else { |
| Index: branches/REL1_5/phase3/RELEASE-NOTES |
| — | — | @@ -721,7 +721,9 @@ |
| 722 | 722 | |
| 723 | 723 | |
| 724 | 724 | === Changes since 1.5rc3 === |
| | 725 | + |
| 725 | 726 | * (bug 3280) Respect 'move' group permission on page moves |
| | 727 | +* (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete |
| 726 | 728 | |
| 727 | 729 | |
| 728 | 730 | === Caveats === |