| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3164,6 +3164,7 @@ |
| 3165 | 3165 | 'config-page-readme', |
| 3166 | 3166 | 'config-page-releasenotes', |
| 3167 | 3167 | 'config-page-copying', |
| | 3168 | + 'config-page-upgradedoc', |
| 3168 | 3169 | 'config-help-restart', |
| 3169 | 3170 | 'config-restart', |
| 3170 | 3171 | 'config-welcome', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -38,6 +38,7 @@ |
| 39 | 39 | 'Readme', |
| 40 | 40 | 'ReleaseNotes', |
| 41 | 41 | 'Copying', |
| | 42 | + 'UpgradeDoc', // Can't use Upgrade due to Upgrade step |
| 42 | 43 | ); |
| 43 | 44 | |
| 44 | 45 | /** |
| — | — | @@ -1600,9 +1601,9 @@ |
| 1601 | 1602 | $text = preg_replace( "/\n([\\*#])([^\r\n]*?)\r?\n([^\r\n#\\*:]+)/", "\n\\1\\2 \\3", $text ); |
| 1602 | 1603 | } while ( $text != $prev ); |
| 1603 | 1604 | // turn (bug nnnn) into links |
| 1604 | | - $text = preg_replace_callback('/\(bug (\d+)\)/', array( 'WebInstaller_ReleaseNotes', 'replaceBugLinks' ), $text ); |
| | 1605 | + $text = preg_replace_callback('/\(bug (\d+)\)/', array( $this, 'replaceBugLinks' ), $text ); |
| 1605 | 1606 | // add links to manual to every global variable mentioned |
| 1606 | | - $text = preg_replace_callback('/(\$wg[a-z0-9_]+)/i', array( 'WebInstaller_ReleaseNotes', 'replaceConfigLinks' ), $text ); |
| | 1607 | + $text = preg_replace_callback('/(\$wg[a-z0-9_]+)/i', array( $this, 'replaceConfigLinks' ), $text ); |
| 1607 | 1608 | // special case for <pre> - formatted links |
| 1608 | 1609 | do { |
| 1609 | 1610 | $prev = $text; |
| — | — | @@ -1611,12 +1612,12 @@ |
| 1612 | 1613 | return $text; |
| 1613 | 1614 | } |
| 1614 | 1615 | |
| 1615 | | - private static function replaceBugLinks( $matches ) { |
| | 1616 | + private function replaceBugLinks( $matches ) { |
| 1616 | 1617 | return '(<span class="config-plainlink">[https://bugzilla.wikimedia.org/show_bug.cgi?id=' . |
| 1617 | 1618 | $matches[1] . ' bug ' . $matches[1] . ']</span>)'; |
| 1618 | 1619 | } |
| 1619 | 1620 | |
| 1620 | | - private static function replaceConfigLinks( $matches ) { |
| | 1621 | + private function replaceConfigLinks( $matches ) { |
| 1621 | 1622 | return '<span class="config-plainlink">[http://www.mediawiki.org/wiki/Manual:' . |
| 1622 | 1623 | $matches[1] . ' ' . $matches[1] . ']</span>'; |
| 1623 | 1624 | } |
| — | — | @@ -1637,7 +1638,14 @@ |
| 1638 | 1639 | return $this->formatTextFile( parent::getFileContents() ); |
| 1639 | 1640 | } |
| 1640 | 1641 | } |
| | 1642 | +class WebInstaller_UpgradeDoc extends WebInstaller_Document { |
| | 1643 | + function getFileName() { return 'UPGRADE'; } |
| 1641 | 1644 | |
| | 1645 | + function getFileContents() { |
| | 1646 | + return $this->formatTextFile( parent::getFileContents() ); |
| | 1647 | + } |
| | 1648 | +} |
| | 1649 | + |
| 1642 | 1650 | class WebInstaller_Copying extends WebInstaller_Document { |
| 1643 | 1651 | function getFileName() { return 'COPYING'; } |
| 1644 | 1652 | |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4148,6 +4148,7 @@ |
| 4149 | 4149 | 'config-page-readme' => 'Read me', |
| 4150 | 4150 | 'config-page-releasenotes' => 'Release notes', |
| 4151 | 4151 | 'config-page-copying' => 'Copying', |
| | 4152 | +'config-page-upgradedoc' => 'Upgrading', |
| 4152 | 4153 | 'config-help-restart' => 'Do you want to clear all saved data that you have entered, and restart the installation process?', |
| 4153 | 4154 | 'config-restart' => 'Yes, restart it', |
| 4154 | 4155 | 'config-welcome' => 'Welcome to MediaWiki! |