| Index: branches/REL1_17/extensions/LiquidThreads/README |
| — | — | @@ -34,36 +34,19 @@ |
| 35 | 35 | 'Summary_talk' => 103 |
| 36 | 36 | ); |
| 37 | 37 | |
| 38 | | -UPGRADES: |
| 39 | | -======== |
| 40 | | - |
| 41 | | -If you are upgrading from an earlier version of Liquid Threads, instead of |
| 42 | | -sourcing lqt.sql, you should source the appropriate schema change files, in |
| 43 | | -order: |
| 44 | | - |
| 45 | | -lqt-schema-change-1.sql for before r25931 |
| 46 | | -lqt-schema-change-2.sql for before r26550 |
| 47 | | -lqt-schema-change-3.sql for before r26563 |
| 48 | | -lqt-schema-change-4.sql for before r26575 |
| 49 | | -lqt-schema-change-5.sql for before r28178 |
| 50 | | -lqt-schema-change-6.sql for before r28693 |
| 51 | | - |
| 52 | | -Also, as of 1.14alpha (r39905), the entry point for LiquidThreads is "extensions/ |
| 53 | | -LiquidThreads/LiquidThreads.php" previously, it had ended in "LqtPages.php." |
| 54 | | -Wikis upgrading with an older configuration need to update this when installing |
| 55 | | -newer versions, or LiquidThreads will not work. |
| 56 | | - |
| 57 | 38 | CONTACT: |
| 58 | 39 | ======= |
| 59 | 40 | |
| 60 | | -* David McCabe |
| 61 | | -* davemccabe@gmail.com (email or jabber) |
| 62 | | -* davidmccabe in #mediawiki on irc.freenode.net |
| | 41 | +* Andrew Garrett |
| | 42 | +* agarrett@wikimedia.org |
| | 43 | +* werdna in #mediawiki on irc.freenode.net |
| 63 | 44 | |
| 64 | 45 | CREDITS: |
| 65 | 46 | ======= |
| 66 | 47 | |
| 67 | | -Written by David McCabe, sponsered by COL.org, Wikia.com, and the Google |
| | 48 | +Originally written by David McCabe, sponsered by COL.org, Wikia.com, and the Google |
| 68 | 49 | Summer of Code, with lots of help from Erik Möller, Brion Vibber, and the kind |
| 69 | 50 | folks on #mediawiki. |
| 70 | 51 | |
| | 52 | +Now maintained by Andrew Garrett from the Wikimedia Foundation |
| | 53 | + |
| Index: branches/REL1_17/phase3/maintenance/archives/patch-archive_ar_revid.sql |
| — | — | @@ -0,0 +1,4 @@ |
| | 2 | +-- Hopefully temporary index. |
| | 3 | +-- For https://bugzilla.wikimedia.org/show_bug.cgi?id=21279 |
| | 4 | +ALTER TABLE /*$wgDBprefix*/archive |
| | 5 | + ADD INDEX ar_revid ( ar_rev_id ); |
| \ No newline at end of file |
| Property changes on: branches/REL1_17/phase3/maintenance/archives/patch-archive_ar_revid.sql |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 6 | + native |
| Index: branches/REL1_17/phase3/maintenance/archives/patch-archive_kill_ar_page_revid.sql |
| — | — | @@ -0,0 +1,4 @@ |
| | 2 | +-- Used for killing the wrong index added during SVN for 1.17 |
| | 3 | +-- Won't affect most people, but it doesn't need to exist |
| | 4 | +ALTER TABLE /*$wgDBprefix*/archive |
| | 5 | + DROP INDEX ar_page_revid; |
| \ No newline at end of file |
| Property changes on: branches/REL1_17/phase3/maintenance/archives/patch-archive_kill_ar_page_revid.sql |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 6 | + native |
| Index: branches/REL1_17/phase3/maintenance/tables.sql |
| — | — | @@ -419,7 +419,7 @@ |
| 420 | 420 | |
| 421 | 421 | CREATE INDEX /*i*/name_title_timestamp ON /*_*/archive (ar_namespace,ar_title,ar_timestamp); |
| 422 | 422 | CREATE INDEX /*i*/ar_usertext_timestamp ON /*_*/archive (ar_user_text,ar_timestamp); |
| 423 | | -CREATE INDEX /*i*/ar_page_revid ON /*_*/archive (ar_namespace, ar_title, ar_rev_id); |
| | 423 | +CREATE INDEX /*i*/ar_revid ON /*_*/archive (ar_rev_id); |
| 424 | 424 | |
| 425 | 425 | |
| 426 | 426 | -- |
| Property changes on: branches/REL1_17/phase3/maintenance/tables.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 427 | 427 | Merged /trunk/phase3/maintenance/tables.sql:r79166,79702,79746 |
| Index: branches/REL1_17/phase3/skins/common/edit.js |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | // apply tagOpen/tagClose to selection in textarea, |
| 80 | 80 | // use sampleText instead of selection if there is none |
| 81 | 81 | window.insertTags = function( tagOpen, tagClose, sampleText ) { |
| 82 | | - if ( typeof $ != 'undefined' && typeof $.fn.textSelection != 'undefined' && |
| | 82 | + if ( typeof $ != 'undefined' && typeof $.fn.textSelection != 'undefined' && currentFocused && |
| 83 | 83 | ( currentFocused.nodeName.toLowerCase() == 'iframe' || currentFocused.id == 'wpTextbox1' ) ) { |
| 84 | 84 | $( '#wpTextbox1' ).textSelection( |
| 85 | 85 | 'encapsulateSelection', { 'pre': tagOpen, 'peri': sampleText, 'post': tagClose } |
| Property changes on: branches/REL1_17/phase3/skins/common/edit.js |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 86 | 86 | Merged /branches/sqlite/skins/common/edit.js:r58211-58321 |
| 87 | 87 | Merged /trunk/phase3/skins/common/edit.js:r79166,79746,79865 |
| 88 | 88 | Merged /branches/new-installer/phase3/skins/common/edit.js:r43664-66004 |
| 89 | 89 | Merged /branches/REL1_15/phase3/skins/common/edit.js:r51646 |
| Index: branches/REL1_17/phase3/includes/MimeMagic.php |
| — | — | @@ -10,6 +10,19 @@ |
| 11 | 11 | * This is used as a fallback to mime.types files. |
| 12 | 12 | * An extensive list of well known mime types is provided by |
| 13 | 13 | * the file mime.types in the includes directory. |
| | 14 | + * |
| | 15 | + * This list concatenated with mime.types is used to create a mime <-> ext |
| | 16 | + * map. Each line contains a mime type followed by a space separated list of |
| | 17 | + * extensions. If multiple extensions for a single mime type exist or if |
| | 18 | + * multiple mime types exist for a single extension then in most cases |
| | 19 | + * MediaWiki assumes that the first extension following the mime type is the |
| | 20 | + * canonical extension, and the first time a mime type appears for a certain |
| | 21 | + * extension is considered the canonical mime type. |
| | 22 | + * |
| | 23 | + * (Note that appending $wgMimeTypeFile to the end of MM_WELL_KNOWN_MIME_TYPES |
| | 24 | + * sucks because you can't redefine canonical types. This could be fixed by |
| | 25 | + * appending MM_WELL_KNOWN_MIME_TYPES behind $wgMimeTypeFile, but who knows |
| | 26 | + * what will break? In practice this probably isn't a problem anyway -- Bryan) |
| 14 | 27 | */ |
| 15 | 28 | define('MM_WELL_KNOWN_MIME_TYPES',<<<END_STRING |
| 16 | 29 | application/ogg ogx ogg ogm ogv oga spx |
| — | — | @@ -41,9 +54,12 @@ |
| 42 | 55 | image/gif gif |
| 43 | 56 | image/jpeg jpeg jpg jpe |
| 44 | 57 | image/png png |
| 45 | | -image/svg+xml image/svg svg |
| | 58 | +image/svg+xml svg |
| | 59 | +image/svg svg |
| 46 | 60 | image/tiff tiff tif |
| 47 | | -image/vnd.djvu image/x.djvu image/x-djvu djvu |
| | 61 | +image/vnd.djvu djvu |
| | 62 | +image/x.djvu djvu |
| | 63 | +image/x-djvu djvu |
| 48 | 64 | image/x-portable-pixmap ppm |
| 49 | 65 | image/x-xcf xcf |
| 50 | 66 | text/plain txt |
| Property changes on: branches/REL1_17/phase3/includes/MimeMagic.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 51 | 67 | Merged /branches/new-installer/phase3/includes/MimeMagic.php:r43664-66004 |
| 52 | 68 | Merged /branches/wmf-deployment/includes/MimeMagic.php:r53381 |
| 53 | 69 | Merged /branches/REL1_15/phase3/includes/MimeMagic.php:r51646 |
| 54 | 70 | Merged /branches/sqlite/includes/MimeMagic.php:r58211-58321 |
| 55 | 71 | Merged /trunk/phase3/includes/MimeMagic.php:r79166,79746,79835 |
| Index: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -171,6 +171,8 @@ |
| 172 | 172 | array( 'doCollationUpdate' ), |
| 173 | 173 | array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ), |
| 174 | 174 | array( 'addTable', 'module_deps', 'patch-module_deps.sql' ), |
| | 175 | + array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), |
| | 176 | + array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), |
| 175 | 177 | ); |
| 176 | 178 | } |
| 177 | 179 | |
| Property changes on: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 178 | 180 | Merged /trunk/phase3/includes/installer/MysqlUpdater.php:r79166,79746,79812 |
| Index: branches/REL1_17/phase3/includes/ImportXMLReader.php |
| — | — | @@ -576,10 +576,10 @@ |
| 577 | 577 | $revision->setComment( $uploadInfo['comment'] ); |
| 578 | 578 | |
| 579 | 579 | if ( isset( $uploadInfo['contributor']['ip'] ) ) { |
| 580 | | - $revision->setUserIP( $revisionInfo['contributor']['ip'] ); |
| | 580 | + $revision->setUserIP( $uploadInfo['contributor']['ip'] ); |
| 581 | 581 | } |
| 582 | 582 | if ( isset( $uploadInfo['contributor']['username'] ) ) { |
| 583 | | - $revision->setUserName( $revisionInfo['contributor']['username'] ); |
| | 583 | + $revision->setUserName( $uploadInfo['contributor']['username'] ); |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | return $this->uploadCallback( $revision ); |
| Property changes on: branches/REL1_17/phase3/includes/ImportXMLReader.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 587 | 587 | Merged /branches/sqlite/includes/ImportXMLReader.php:r58211-58321 |
| 588 | 588 | Merged /trunk/phase3/includes/ImportXMLReader.php:r79166,79746,79838 |
| 589 | 589 | Merged /branches/new-installer/phase3/includes/ImportXMLReader.php:r43664-66004 |
| 590 | 590 | Merged /branches/wmf-deployment/includes/ImportXMLReader.php:r53381 |
| 591 | 591 | Merged /branches/REL1_15/phase3/includes/ImportXMLReader.php:r51646 |
| Index: branches/REL1_17/phase3/includes/DefaultSettings.php |
| — | — | @@ -3087,11 +3087,6 @@ |
| 3088 | 3088 | * @since 1.17 |
| 3089 | 3089 | */ |
| 3090 | 3090 | $wgSecureLogin = false; |
| 3091 | | -/** |
| 3092 | | - * Default for 'use secure login' checkbox |
| 3093 | | - * @since 1.17 |
| 3094 | | - */ |
| 3095 | | -$wgSecureLoginStickHTTPS = false; |
| 3096 | 3091 | |
| 3097 | 3092 | /** @} */ # end user accounts } |
| 3098 | 3093 | |
| Property changes on: branches/REL1_17/phase3/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 3099 | 3094 | Merged /branches/REL1_15/phase3/includes/DefaultSettings.php:r51646 |
| 3100 | 3095 | Merged /branches/sqlite/includes/DefaultSettings.php:r58211-58321 |
| 3101 | 3096 | Merged /trunk/phase3/includes/DefaultSettings.php:r79166,79746,79860 |
| 3102 | 3097 | Merged /branches/new-installer/phase3/includes/DefaultSettings.php:r43664-66004 |
| 3103 | 3098 | Merged /branches/wmf-deployment/includes/DefaultSettings.php:r53381 |
| Index: branches/REL1_17/phase3/includes/specials/SpecialPrefixindex.php |
| — | — | @@ -54,12 +54,17 @@ |
| 55 | 55 | : wfMsg( 'prefixindex' ) |
| 56 | 56 | ); |
| 57 | 57 | |
| | 58 | + $showme = ''; |
| 58 | 59 | if( isset( $par ) ){ |
| 59 | | - $this->showPrefixChunk( $namespace, $par, $from ); |
| | 60 | + $showme = $par; |
| 60 | 61 | } elseif( $prefix != '' ){ |
| 61 | | - $this->showPrefixChunk( $namespace, $prefix, $from ); |
| | 62 | + $showme = $prefix; |
| 62 | 63 | } elseif( $from != '' ){ |
| 63 | | - $this->showPrefixChunk( $namespace, $from, $from ); |
| | 64 | + // For back-compat with Special:Allpages |
| | 65 | + $showme = $from; |
| | 66 | + } |
| | 67 | + if ($showme != '' || $namespace) { |
| | 68 | + $this->showPrefixChunk( $namespace, $showme, $from ); |
| 64 | 69 | } else { |
| 65 | 70 | $wgOut->addHTML( $this->namespacePrefixForm( $namespace, null ) ); |
| 66 | 71 | } |
| Property changes on: branches/REL1_17/phase3/includes/specials/SpecialPrefixindex.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 67 | 72 | Merged /branches/wmf-deployment/includes/specials/SpecialPrefixindex.php:r53381,56967 |
| 68 | 73 | Merged /branches/REL1_15/phase3/includes/specials/SpecialPrefixindex.php:r51646 |
| 69 | 74 | Merged /branches/sqlite/includes/specials/SpecialPrefixindex.php:r58211-58321 |
| 70 | 75 | Merged /trunk/phase3/includes/specials/SpecialPrefixindex.php:r79166,79746,79851 |
| Index: branches/REL1_17/phase3/index.php |
| — | — | @@ -16,7 +16,8 @@ |
| 17 | 17 | * Copyright (C) 2001-2010 Magnus Manske, Brion Vibber, Lee Daniel Crocker, |
| 18 | 18 | * Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, |
| 19 | 19 | * Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, |
| 20 | | - * Aaron Schulz and others. |
| | 20 | + * Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber |
| | 21 | + * Siebrand Mazeland, Chad Horohoe, Roan Kattouw and others. |
| 21 | 22 | * |
| 22 | 23 | * This program is free software; you can redistribute it and/or modify |
| 23 | 24 | * it under the terms of the GNU General Public License as published by |
| Index: branches/REL1_17/phase3/README |
| — | — | @@ -36,6 +36,15 @@ |
| 37 | 37 | * Yuri Astrakhan |
| 38 | 38 | * Aryeh Gregor |
| 39 | 39 | * Aaron Schulz |
| | 40 | +* Andrew Garrett |
| | 41 | +* Raimond Spekking |
| | 42 | +* Alexandre Emsenhuber |
| | 43 | +* Siebrand Mazeland |
| | 44 | +* Chad Horohoe |
| | 45 | +* Roan Kattouw |
| | 46 | +* Trevor Pascal |
| | 47 | +* Bryan Tong Minh |
| | 48 | +* Sam Reed |
| 40 | 49 | * Several others (view CREDITS for a more complete list) |
| 41 | 50 | |
| 42 | 51 | The contributors hold the copyright to this work, and it is licensed under the |
| Property changes on: branches/REL1_17/phase3/README |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 43 | 52 | Merged /branches/sqlite/README:r58211-58321 |
| 44 | 53 | Merged /trunk/phase3/README:r79166,79746,79846 |
| 45 | 54 | Merged /branches/new-installer/phase3/README:r43664-66004 |
| 46 | 55 | Merged /branches/REL1_15/phase3/README:r51646 |
| Index: branches/REL1_17/phase3/languages/Names.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | 'avk' => 'Kotava', # Kotava |
| 29 | 29 | 'ay' => 'Aymar aru', # Aymara |
| 30 | 30 | 'az' => 'Azərbaycanca', # Azerbaijani |
| 31 | | - 'ba' => 'Башҡорт', # Bashkir |
| | 31 | + 'ba' => 'Башҡортса', # Bashkir |
| 32 | 32 | 'bar' => 'Boarisch', # Bavarian (Austro-Bavarian and South Tyrolean) |
| 33 | 33 | 'bat-smg' => 'Žemaitėška', # Samogitian (deprecated code, 'sgs' in ISO 693-3 since 2010-06-30 ) |
| 34 | 34 | 'bcc' => 'بلوچی مکرانی', # Southern Balochi |
| Property changes on: branches/REL1_17/phase3/languages/Names.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 35 | 35 | Merged /branches/sqlite/languages/Names.php:r58211-58321 |
| 36 | 36 | Merged /trunk/phase3/languages/Names.php:r79166,79746,79894 |
| 37 | 37 | Merged /branches/new-installer/phase3/languages/Names.php:r43664-66004 |
| 38 | 38 | Merged /branches/REL1_15/phase3/languages/Names.php:r51646 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | without having to move LocalSettings.php |
| 85 | 85 | * The FailFunction "error handling" method has now been removed |
| 86 | 86 | * $wgAdditionalMailParams added to allow setting extra options to mail() calls. |
| 87 | | -* $wgSecureLogin & $wgSecureLoginStickHTTPS to optionaly login using HTTPS |
| | 87 | +* $wgSecureLogin to optionaly login using HTTPS |
| 88 | 88 | * (bug 25728) Added $wgPasswordSenderName to allow customise the name associed |
| 89 | 89 | with $wgPasswordSender |
| 90 | 90 | * Sysops now have the "suppressredirect" right by default |
| Property changes on: branches/REL1_17/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 91 | 91 | Merged /branches/new-installer/phase3/RELEASE-NOTES:r43664-66004 |
| 92 | 92 | Merged /branches/REL1_15/phase3/RELEASE-NOTES:r51646 |
| 93 | 93 | Merged /trunk/phase3/HISTORY:r79860 |
| 94 | 94 | Merged /branches/sqlite/RELEASE-NOTES:r58211-58321 |
| 95 | 95 | Merged /trunk/phase3/RELEASE-NOTES:r79166,79746 |