| Index: trunk/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: trunk/phase3/includes/Database.php |
| — | — | @@ -1522,7 +1522,7 @@ |
| 1523 | 1523 | /** |
| 1524 | 1524 | * @todo document |
| 1525 | 1525 | */ |
| 1526 | | - function resultObject( &$result ) { |
| | 1526 | + function resultObject( $result ) { |
| 1527 | 1527 | if( empty( $result ) ) { |
| 1528 | 1528 | return NULL; |
| 1529 | 1529 | } else { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -68,8 +68,8 @@ |
| 69 | 69 | * (bug 3284) Ipblocklist paging, substring search |
| 70 | 70 | * Allow filtering of robot edits in Special:Watchlist by stting |
| 71 | 71 | $wgFilterRobotsWL = true. |
| | 72 | +* (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete |
| 72 | 73 | |
| 73 | | ->>>>>>> 1.394 |
| 74 | 74 | |
| 75 | 75 | === Caveats === |
| 76 | 76 | |