Fix author list duplication.

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index a11f2f3..91c1f6b 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -66,7 +66,6 @@ This program is distributed in the hope that it will be useful, but '''without a
 See the GNU General Public License for more details.
 
 You should have received <doclink href=Copying>a copy of the GNU General Public License</doclink> along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. or [http://www.gnu.org/copyleft/gpl.html read it online].",
-       'config-authors'                  => 'MediaWiki is Copyright © 2001-2010 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber, Siebrand Mazeland, Chad Horohoe and others.', // TODO: move this to core strings and use it in Special:Version, too?
        'config-sidebar'                  => "* [http://www.mediawiki.org MediaWiki home]
 * [http://www.mediawiki.org/wiki/Help:Contents User's Guide]
 * [http://www.mediawiki.org/wiki/Manual:Contents Administrator's Guide]

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 9d93f95..97fa8df 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -197,7 +197,8 @@ class WebInstaller_Welcome extends WebInstallerPage {
                $this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
                $status = $this->parent->doEnvironmentChecks();
                if ( $status ) {
-                       $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', wfMsg( 'config-authors' ) ) );
+                       $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', 
+                               SpecialVersion::getCopyrightAndAuthorList() ) );
                        $this->startForm();
                        $this->endForm();
                }

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 82d2b7d..2f726d4 100644 (file)
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -89,14 +89,33 @@ class SpecialVersion extends SpecialPage {
                // This text is always left-to-right.
                $ret .= '<div>';
                $ret .= "__NOTOC__
-               " . wfMsg( 'version-poweredby-credits', date( 'Y' ),
-                               $wgLang->listToText( $authorList ) ) . "\n
+               " . self::getCopyrightAndAuthorList() . "\n
                " . wfMsg( 'version-license-info' );
                $ret .= '</div>';
 
                return str_replace( "\t\t", '', $ret ) . "\n";
        }
 
+       /**
+        * Get the "Mediawiki is copyright 2001-20xx by lots of cool guys" text
+        *
+        * @return String
+        */
+       public static function getCopyrightAndAuthorList() {
+               global $wgLang;
+
+               $authorList = array( 'Magnus Manske', 'Brion Vibber', 'Lee Daniel Crocker',
+                       'Tim Starling', 'Erik Möller', 'Gabriel Wicke', 'Ævar Arnfjörð Bjarmason',
+                       'Niklas Laxström', 'Domas Mituzas', 'Rob Church', 'Yuri Astrakhan',
+                       'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett', 'Raimond Spekking',
+                       'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe',
+                       wfMsg( 'version-poweredby-others' )
+               );
+
+               return wfMsg( 'version-poweredby-credits', date( 'Y' ),
+                       $wgLang->listToText( $authorList ) );
+       }
+
        /**
         * Returns wiki text showing the third party software versions (apache, php, mysql).
         *