From d7126bba8538059b7bf99b26247c46463f4649a6 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Mon, 6 Dec 2010 13:30:24 +0000 Subject: [PATCH] * Reformatted several text documents to be a hybrid between wikitext and plain text, so that they look nicer in the new installer. * Removed the specialised getFileContents() functions, they are unnecessary now that I have reformatted COPYING into wikitext. In WebInstaller_Document::formatTextFile(): * Introduced new tab-indented syntax, which is equivalent to colon indents in ordinary wikitext. This was useful for reformatting the GPL. * Removed the special case for spaces preceding URLs, used tabs instead, with the above feature. * Removed the "numbers in square brackets" feature. The place where this was used, in README, was an unfortunate case where the square brackets originally indicated a footnote and its reference. Then another two "footnotes" were added with no corresponding reference, they just talked about random license-related stuff that happened to be similar to the footnote. It was never actually meant to be a numbered list. Fixed in README. * Convert from DOS line endings to UNIX early on, to simplify the regexes. --- COPYING | 188 ++++++++++++------------ README | 43 +++--- RELEASE-NOTES | 6 +- UPGRADE | 33 ++--- includes/installer/WebInstallerPage.php | 51 ++----- 5 files changed, 143 insertions(+), 178 deletions(-) diff --git a/COPYING b/COPYING index d7c31ed3f1..019694a9b8 100644 --- a/COPYING +++ b/COPYING @@ -1,14 +1,15 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +== GNU GENERAL PUBLIC LICENSE == - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Version 2, June 1991 - Preamble +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. - The licenses for most software are designed to take away your +=== Preamble === + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This @@ -18,48 +19,47 @@ using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. - When we speak of free software, we are referring to freedom, not +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - For example, if you distribute copies of such a program, whether +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - We protect your rights with two steps: (1) copyright the software, and +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - Also, for each author's protection and ours, we want to make certain +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - Finally, any free program is threatened constantly by software +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains +== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION == + +'''0.''' This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -76,7 +76,7 @@ is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - 1. You may copy and distribute verbatim copies of the Program's +'''1.''' You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the @@ -87,30 +87,30 @@ along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - 2. You may modify your copy or copies of the Program or any portion +'''2.''' You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - + '''a)''' You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + '''b)''' You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + '''c)''' If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -131,26 +131,26 @@ with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - 3. You may copy and distribute the Program (or a work based on it, +'''3.''' You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + '''a)''' Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + '''b)''' Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + '''c)''' Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source @@ -168,8 +168,8 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program + +'''4.''' You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. @@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - 5. You are not required to accept this License, since you have not +'''5.''' You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by @@ -186,7 +186,7 @@ Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - 6. Each time you redistribute the Program (or any work based on the +'''6.''' Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further @@ -194,7 +194,7 @@ restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - 7. If, as a consequence of a court judgment or allegation of patent +'''7.''' If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -225,8 +225,8 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in + +'''8.''' If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding @@ -234,7 +234,7 @@ those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - 9. The Free Software Foundation may publish revised and/or new versions +'''9.''' The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -247,7 +247,7 @@ Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free +'''10.''' If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes @@ -255,9 +255,9 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY +=== NO WARRANTY === - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +'''11.''' BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED @@ -267,7 +267,7 @@ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +'''12.''' IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING @@ -277,35 +277,36 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + '''END OF TERMS AND CONDITIONS''' + +== How to Apply These Terms to Your New Programs == - If you develop a new program, and you want it to be of the greatest +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - To do so, attach the following notices to the program. It is safest +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + Copyright (C) - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Also add information on how to contact you by electronic and paper mail. @@ -313,10 +314,10 @@ Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may @@ -327,11 +328,12 @@ You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 - , 1 April 1989 - Ty Coon, President of Vice + Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may diff --git a/README b/README index 861d2525bc..7cc4305070 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ The MediaWiki software was written by: * Several others (view CREDITS for a more complete list) The contributors hold the copyright to this work, and it is licensed under the -terms of the GNU General Public License, version 2 or later[1] (see +terms of the GNU General Public License, version 2 or later (see http://www.fsf.org/licensing/licenses/gpl.html). Derivative works and later versions of the code must be free software licensed under the same or a compatible license. This includes "extensions" that use MediaWiki functions or @@ -48,66 +48,65 @@ details. The Wikimedia Foundation currently has no legal rights to the software. -[1] Sections of code written exclusively by Lee Crocker or Erik Moeller are also +Sections of code written exclusively by Lee Crocker or Erik Moeller are also released into the public domain, which does not impair the obligations of users under the GPL for use of the whole code or other sections thereof. -[2] MediaWiki makes use of the Sajax Toolkit by modernmethod, - http://www.modernmethod.com/sajax/ - which has the following license: +MediaWiki makes use of the Sajax Toolkit by modernmethod, +http://www.modernmethod.com/sajax/ which has the following license: - 'This work is licensed under the Creative Commons Attribution - License. To view a copy of this license, visit - http://creativecommons.org/licenses/by/2.0/ or send a letter - to Creative Commons, 559 Nathan Abbott Way, - Stanford, California 94305, USA.' + 'This work is licensed under the Creative Commons Attribution + License. To view a copy of this license, visit + http://creativecommons.org/licenses/by/2.0/ or send a letter + to Creative Commons, 559 Nathan Abbott Way, + Stanford, California 94305, USA.' -[3] MediaWiki use Creative Commons license marks to points to their online +MediaWiki use Creative Commons license marks to points to their online licenses. This content is trademarked and used under a specific license available at http://creativecommons.org/policies#trademark The restricted content is: - skins/common/images/cc-by-nc-sa.png - skins/common/images/cc-by-sa.png +* skins/common/images/cc-by-nc-sa.png +* skins/common/images/cc-by-sa.png Many thanks to the Wikimedia regulars for testing and suggestions. The official website for MediaWiki is located at: - http://www.mediawiki.org/ + http://www.mediawiki.org/ The code is currently maintained in a Subversion repository at svn.wikimedia.org. See http://www.mediawiki.org/wiki/Subversion for details. Please report bugs and make feature requests in our Bugzilla system: - https://bugzilla.wikimedia.org/ +* https://bugzilla.wikimedia.org/ Documentation and discussion on new features may be found at: - http://www.mediawiki.org/wiki/Manual:FAQ - http://www.mediawiki.org/wiki/Documentation - http://www.mediawiki.org/wiki/Development +* http://www.mediawiki.org/wiki/Manual:FAQ +* http://www.mediawiki.org/wiki/Documentation +* http://www.mediawiki.org/wiki/Development Extensions are listed at: - http://www.mediawiki.org/wiki/Category:Extensions +* http://www.mediawiki.org/wiki/Category:Extensions If you are setting up your own wiki based on this software, it is highly recommended that you subscribe to mediawiki-announce: - https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce +* https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce The mailing list is very low volume, and is intended primarily for announcements of new versions, bug fixes, and security issues. A higher volume support mailing list can be found at: - https://lists.wikimedia.org/mailman/listinfo/mediawiki-l +* https://lists.wikimedia.org/mailman/listinfo/mediawiki-l Developer discussion takes place at: - https://lists.wikimedia.org/mailman/listinfo/wikitech-l +* https://lists.wikimedia.org/mailman/listinfo/wikitech-l There is also a development and support channel #mediawiki on irc.freenode.net, and an unoffical support forum at www.mwusers.com. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c16776b6e8..2ff7a0b280 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -635,7 +635,7 @@ built up on MediaWiki.org, and is covered under the GNU Free Documentation License (except for pages that explicitly state that their contents are in the public domain) : - http://www.mediawiki.org/wiki/Documentation + http://www.mediawiki.org/wiki/Documentation === Mailing list === @@ -643,11 +643,11 @@ the public domain) : A MediaWiki-l mailing list has been set up distinct from the Wikipedia wikitech-l list: - http://lists.wikimedia.org/mailman/listinfo/mediawiki-l + http://lists.wikimedia.org/mailman/listinfo/mediawiki-l A low-traffic announcements-only list is also available: - http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce + http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce It's highly recommended that you sign up for one of these lists if you're going to run a public MediaWiki, so you can be notified of security fixes. diff --git a/UPGRADE b/UPGRADE index e22886a8e8..b7be61351f 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,3 +1,4 @@ + This file provides an overview of the MediaWiki upgrade process. For help with specific problems, check @@ -118,10 +119,8 @@ Note that the large number of deletions may cause older edits to expire from the list on Special:Recentchanges, although the deletions themselves will be hidden by default. (Click "show bot edits" to list them.) - See RELEASE-NOTES for more details about new and changed options. - == Upgrading from 1.7 wikis == $wgDefaultUserOptions now contains all the defaults, not only overrides. @@ -131,9 +130,6 @@ to set only specific items as recommended in DefaultSettings.php. == Upgrading from 1.6 wikis == $wgLocalTZoffset was in hours, it is now using minutes. -Link autonumbering got fixed (#5918) for protocols other than http. - - 'irc://irc.server.tld/' render as a link with a chat icon - - '[irc://irc.server.tld]' render as an autonumbered link: [1] == Upgrading from pre-1.5 wikis == @@ -259,19 +255,20 @@ to this: As well as new messages, the processing of some messages has changed. If you have customized them, please compare the new format using Special:Allmessages or the relevant LanguageXX.php files: - copyrightwarning - dberrortext - editingcomment (was named commentedit) - editingsection (was named sectionedit) - numauthors - numedits - numtalkauthors - numtalkedits - numwatchers - protectedarticle - searchresulttext - showhideminor - unprotectedarticle + +* copyrightwarning +* dberrortext +* editingcomment (was named commentedit) +* editingsection (was named sectionedit) +* numauthors +* numedits +* numtalkauthors +* numtalkedits +* numwatchers +* protectedarticle +* searchresulttext +* showhideminor +* unprotectedarticle Note that the 1.3 beta releases included a potential vulnerability if PHP is configured with register_globals on and the includes directory is diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index dcde76fe44..e5f0c09119 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -979,6 +979,7 @@ abstract class WebInstaller_Document extends WebInstallerPage { public function execute() { $text = $this->getFileContents(); + $text = $this->formatTextFile( $text ); $this->parent->output->addWikiText( $text ); $this->startForm(); $this->endForm( false ); @@ -989,24 +990,21 @@ abstract class WebInstaller_Document extends WebInstallerPage { } protected function formatTextFile( $text ) { - $text = str_replace( array( '<', '{{', '[[' ), - array( '<', '{{', '[[' ), $text ); - // replace numbering with [1], [2], etc with MW-style numbering - $text = preg_replace( "/\r?\n(\r?\n)?\\[\\d+\\]/m", "\\1#", $text ); + // Use Unix line endings, escape some wikitext stuff + $text = str_replace( array( '<', '{{', '[[', "\r" ), + array( '<', '{{', '[[', '' ), $text ); // join word-wrapped lines into one do { $prev = $text; - $text = preg_replace( "/\n([\\*#])([^\r\n]*?)\r?\n([^\r\n#\\*:]+)/", "\n\\1\\2 \\3", $text ); + $text = preg_replace( "/\n([\\*#\t])([^\n]*?)\n([^\n#\\*:]+)/", "\n\\1\\2 \\3", $text ); } while ( $text != $prev ); + // Replace tab indents with colons + $text = preg_replace( '/^\t\t/m', '::', $text ); + $text = preg_replace( '/^\t/m', ':', $text ); // turn (bug nnnn) into links $text = preg_replace_callback('/bug (\d+)/', array( $this, 'replaceBugLinks' ), $text ); // add links to manual to every global variable mentioned $text = preg_replace_callback('/(\$wg[a-z0-9_]+)/i', array( $this, 'replaceConfigLinks' ), $text ); - // special case for 
 - formatted links
-		do {
-			$prev = $text;
-			$text = preg_replace( '/^([^\\s].*?)\r?\n[\\s]+(https?:\/\/)/m', "\\1\n:\\2", $text );
-		} while ( $text != $prev );
 		return $text;
 	}
 
@@ -1023,49 +1021,18 @@ abstract class WebInstaller_Document extends WebInstallerPage {
 }
 
 class WebInstaller_Readme extends WebInstaller_Document {
-	
 	protected function getFileName() { return 'README'; }
-
-	public function getFileContents() {
-		return $this->formatTextFile( parent::getFileContents() );
-	}
-	
 }
 
 class WebInstaller_ReleaseNotes extends WebInstaller_Document {
-	
 	protected function getFileName() { return 'RELEASE-NOTES'; }
-
-	public function getFileContents() {
-		return $this->formatTextFile( parent::getFileContents() );
-	}
-	
 }
 
 class WebInstaller_UpgradeDoc extends WebInstaller_Document {
-	
 	protected function getFileName() { return 'UPGRADE'; }
-
-	public function getFileContents() {
-		return $this->formatTextFile( parent::getFileContents() );
-	}
-	
 }
 
 class WebInstaller_Copying extends WebInstaller_Document {
-	
 	protected function getFileName() { return 'COPYING'; }
-
-	public function getFileContents() {
-		$text = parent::getFileContents();
-		$text = str_replace( "\x0C", '', $text );
-		$text = preg_replace_callback( '/\n[ \t]+/m', array( 'WebInstaller_Copying', 'replaceLeadingSpaces' ), $text );
-		$text = '' . nl2br( $text ) . '';
-		return $text;
-	}
-
-	private static function replaceLeadingSpaces( $matches ) {
-		return "\n" . str_repeat( ' ', strlen( $matches[0] ) );
-	}
-	
 }
+
-- 
2.20.1