| Index: branches/wmf/1.19wmf1/maintenance/language/messages.inc |
| — | — | @@ -3578,6 +3578,34 @@ |
| 3579 | 3579 | 'logentry-newusers-autocreate', |
| 3580 | 3580 | 'newuserlog-byemail', |
| 3581 | 3581 | ), |
| | 3582 | + 'logging-irc' => array( |
| | 3583 | + 'revdelete-logentry', |
| | 3584 | + 'logdelete-logentry', |
| | 3585 | + 'revdelete-content', |
| | 3586 | + 'revdelete-summary', |
| | 3587 | + 'revdelete-uname', |
| | 3588 | + 'revdelete-hid', |
| | 3589 | + 'revdelete-unhid', |
| | 3590 | + 'revdelete-log-message', |
| | 3591 | + 'logdelete-log-message', |
| | 3592 | + 'deletedarticle', |
| | 3593 | + 'suppressedarticle', |
| | 3594 | + 'undeletedarticle', |
| | 3595 | + 'patrol-log-line', |
| | 3596 | + 'patrol-log-auto', |
| | 3597 | + 'patrol-log-diff', |
| | 3598 | + '1movedto2', |
| | 3599 | + '1movedto2_redir', |
| | 3600 | + 'move-redirect-suppressed', |
| | 3601 | + 'newuserlog-byemail', |
| | 3602 | + 'newuserlog-create-entry', |
| | 3603 | + 'newuserlog-create2-entry', |
| | 3604 | + 'newuserlog-autocreate-entry', |
| | 3605 | + 'suppressedarticle', |
| | 3606 | + 'deletedarticle', |
| | 3607 | + 'uploadedimage', |
| | 3608 | + 'overwroteimage', |
| | 3609 | + ), |
| 3582 | 3610 | 'feedback' => array( |
| 3583 | 3611 | 'feedback-bugornote', |
| 3584 | 3612 | 'feedback-subject', |
| — | — | @@ -3865,6 +3893,7 @@ |
| 3866 | 3894 | 'html-forms' => 'HTML forms', |
| 3867 | 3895 | 'sqlite' => 'SQLite database support', |
| 3868 | 3896 | 'logging' => 'New logging system', |
| | 3897 | + 'logging-irc' => 'For IRC, see bug 34508. Do not change', |
| 3869 | 3898 | 'feedback' => 'Feedback', |
| 3870 | 3899 | 'apierrors' => 'API errors', |
| 3871 | 3900 | ); |
| Index: branches/wmf/1.19wmf1/maintenance/language/messageTypes.inc |
| — | — | @@ -191,6 +191,32 @@ |
| 192 | 192 | 'longpage-hint', |
| 193 | 193 | 'javascripttest-backlink', |
| 194 | 194 | 'javascripttest-qunit-name', |
| | 195 | + 'revdelete-logentry', |
| | 196 | + 'logdelete-logentry', |
| | 197 | + 'revdelete-content', |
| | 198 | + 'revdelete-summary', |
| | 199 | + 'revdelete-uname', |
| | 200 | + 'revdelete-hid', |
| | 201 | + 'revdelete-unhid', |
| | 202 | + 'revdelete-log-message', |
| | 203 | + 'logdelete-log-message', |
| | 204 | + 'deletedarticle', |
| | 205 | + 'suppressedarticle', |
| | 206 | + 'undeletedarticle', |
| | 207 | + 'patrol-log-line', |
| | 208 | + 'patrol-log-auto', |
| | 209 | + 'patrol-log-diff', |
| | 210 | + '1movedto2', |
| | 211 | + '1movedto2_redir', |
| | 212 | + 'move-redirect-suppressed', |
| | 213 | + 'newuserlog-byemail', |
| | 214 | + 'newuserlog-create-entry', |
| | 215 | + 'newuserlog-create2-entry', |
| | 216 | + 'newuserlog-autocreate-entry', |
| | 217 | + 'suppressedarticle', |
| | 218 | + 'deletedarticle', |
| | 219 | + 'uploadedimage', |
| | 220 | + 'overwroteimage', |
| 195 | 221 | ); |
| 196 | 222 | |
| 197 | 223 | /** Optional messages, which may be translated only if changed in the target language. */ |
| Index: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 |
| — | — | @@ -247,6 +247,7 @@ |
| 248 | 248 | * (bug 31676) Group dynamically inserted CSS into a single <style> tag, to work |
| 249 | 249 | around a bug where not all styles were applied in Internet Explorer |
| 250 | 250 | * (bug 28936, bug 5280) Broken or invalid titles can't be removed from watchlist. |
| | 251 | +* (bug 34600) Older skins using useHeadElement=false were broken in 1.18 |
| 251 | 252 | |
| 252 | 253 | === API changes in 1.19 === |
| 253 | 254 | * Made action=edit less likely to return "unknownerror", by returning the actual error |
| Index: branches/wmf/1.19wmf1/includes/SkinTemplate.php |
| — | — | @@ -455,7 +455,7 @@ |
| 456 | 456 | if ( $this->useHeadElement ) { |
| 457 | 457 | $tpl->set( 'headelement', $out->headElement( $this ) ); |
| 458 | 458 | } else { |
| 459 | | - $tpl->set( 'headscripts', $out->getScript() ); |
| | 459 | + $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() ); |
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | $tpl->set( 'debughtml', $this->generateDebugHTML() ); |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 463 | 463 | Merged /trunk/phase3/includes:r112152 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 464 | 464 | Merged /trunk/phase3:r112034,112037,112100,112141,112152 |