r59716 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r59715‎ | r59716 | r59717 >
Date:00:16, 4 December 2009
Author:siebrand
Status:ok
Tags:
Comment:
Fix register_globals vulnerability in r56261. WikimediaLicenseTexts is now a separate extension
Modified paths:
  • /trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.php (added) (history)
  • /trunk/extensions/WikimediaMessages/WikimediaMessages.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMessages/WikimediaMessages.php
@@ -10,12 +10,6 @@
1111 * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
1212 */
1313
14 -// Settings
15 -if( !isset( $wgWikimediaLicenseTexts ) ) {
16 - // Set to true in LocalSettings.php to load Wikimedia license texts
17 - $wgWikimediaLicenseTexts = false;
18 -}
19 -
2014 $wgExtensionCredits['other'][] = array(
2115 'path' => __FILE__,
2216 'name' => 'WikimediaMessages',
@@ -29,19 +23,6 @@
3024 $wgExtensionMessagesFiles['WikimediaMessages'] = $dir .'WikimediaMessages.i18n.php';
3125 $wgExtensionFunctions[] = 'wfSetupWikimediaMessages';
3226
33 -if( $wgWikimediaLicenseTexts ) {
34 - $wgExtensionCredits['other'][] = array(
35 - 'path' => __FILE__,
36 - 'name' => 'WikimediaLicenseTexts',
37 - 'url' => 'http://www.mediawiki.org/wiki/Extension:WikimediaMessages',
38 - 'author' => array( 'Multichill', 'Siebrand Mazeland' ),
39 - 'description' => 'Wikimedia license texts',
40 - 'descriptionmsg' => 'wikimedialicensetexts-desc',
41 - );
42 -
43 - $wgExtensionMessagesFiles['WikimediaLicenseTexts'] = $dir . '/WikimediaLicenseTexts.i18n.php';
44 -}
45 -
4627 include_once ( $dir .'WikimediaGrammarForms.php' );
4728
4829 function wfSetupWikimediaMessages() {
Index: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.php
@@ -0,0 +1,22 @@
 2+<?php
 3+if (!defined('MEDIAWIKI')) die();
 4+/**
 5+ * An extension that adds Wikimedia specific functionality
 6+ *
 7+ * @addtogroup Extensions
 8+ *
 9+ * @copyright Copyright © 2008-2009, Tim Starling
 10+ * @copyright Copyright © 2009, Siebrand Mazeland, Multichill
 11+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
 12+ */
 13+
 14+$wgExtensionCredits['other'][] = array(
 15+ 'path' => __FILE__,
 16+ 'name' => 'WikimediaLicenseTexts',
 17+ 'url' => 'http://www.mediawiki.org/wiki/Extension:WikimediaMessages',
 18+ 'author' => array( 'Multichill', 'Siebrand Mazeland' ),
 19+ 'description' => 'Wikimedia license texts',
 20+ 'descriptionmsg' => 'wikimedialicensetexts-desc',
 21+);
 22+
 23+$wgExtensionMessagesFiles['WikimediaLicenseTexts'] = $dir . '/WikimediaLicenseTexts.i18n.php';
Property changes on: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.php
___________________________________________________________________
Name: svn:eol-style
124 + native
Name: svn:keywords
225 + Id

Follow-up revisions

RevisionCommit summaryAuthorDate
r61845Fix for r59716: undefined variable $dir. Caused this extension to break on WM...tstarling05:58, 2 February 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56261* add module 'WikimediaLicenseTexts'. Disabled by default. This module is add...siebrand13:09, 13 September 2009

Status & tagging log