r53060 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r53059‎ | r53060 | r53061 >
Date:16:12, 10 July 2009
Author:tparscal
Status:deferred
Tags:
Comment:
Solved rg vulnerability in UsabilityInitiative extension. IMPORTANT! YOU MUST NOW INCLUDE MODULES DIRECTLY OR THING MAY BREAK!
Modified paths:
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/OptIn/OptIn.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/UsabilityInitiative.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.php
@@ -8,8 +8,9 @@
99 * This file contains the main include file for the UsabilityInitiative
1010 * extension of MediaWiki.
1111 *
12 - * Usage: Add the following line in LocalSettings.php:
13 - * require_once( "$IP/extensions/UsabilityInitiative/UsabilityInitiative.php" );
 12+ * Usage: Inlcude the modules you want to use specifically by adding a line in
 13+ * LocalSettings.php for each of them like this:
 14+ * require_once( "$IP/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php" );
1415 *
1516 * @author Trevor Parscal <tparscal@wikimedia.org>
1617 * Allow "or a later version" here?
@@ -42,12 +43,6 @@
4344 $wgExtensionMessagesFiles['UsabilityInitiative'] =
4445 dirname( __FILE__ ) . "/UsabilityInitiative.i18n.php";
4546
46 -// Includes sub-extensions
47 -require_once( dirname( __FILE__ ) . "/EditToolbar/EditToolbar.php" );
48 -require_once( dirname( __FILE__ ) . "/EditWarning/EditWarning.php" );
49 -require_once( dirname( __FILE__ ) . "/PrefStats/PrefStats.php" );
50 -require_once( dirname( __FILE__ ) . "/OptIn/OptIn.php" );
51 -
5247 // Registers Hooks
5348 $wgHooks['AjaxAddScript'][] = 'UsabilityInitiativeHooks::addJs';
5449 $wgHooks['BeforePageDisplay'][] = 'UsabilityInitiativeHooks::addCss';
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
@@ -8,7 +8,8 @@
99 * This file contains the include file for the EditToolbar portion of the
1010 * UsabilityInitiative extension of MediaWiki.
1111 *
12 - * Usage: This file is included automatically by ../UsabilityInitiative.php
 12+ * Usage: Include the following line in your LocalSettings.php
 13+ * require_once( "$IP/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php" );
1314 *
1415 * @author Trevor Parscal <tparscal@wikimedia.org>
1516 * @license GPL v2 or later
@@ -40,6 +41,9 @@
4142 'descriptionmsg' => 'edittoolbar-desc',
4243 );
4344
 45+// Includes parent extension
 46+require_once( dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative.php" );
 47+
4448 // Adds Autoload Classes
4549 $wgAutoloadClasses['EditToolbarHooks'] =
4650 dirname( __FILE__ ) . '/EditToolbar.hooks.php';
Index: trunk/extensions/UsabilityInitiative/OptIn/OptIn.php
@@ -8,7 +8,8 @@
99 * This file contains the include file for the OptIn portion of the
1010 * UsabilityInitiative extension of MediaWiki.
1111 *
12 - * Usage: This file is included automatically by ../UsabilityInitiative.php
 12+ * Usage: Include the following line in your LocalSettings.php
 13+ * require_once( "$IP/extensions/UsabilityInitiative/OptIn/OptIn.php" );
1314 *
1415 * @author Roan Kattouw <roan.kattouw@gmail.com>
1516 * @license GPL v2 or later
@@ -107,6 +108,9 @@
108109 'descriptionmsg' => 'optin-desc',
109110 );
110111
 112+// Includes parent extension
 113+require_once( dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative.php" );
 114+
111115 // Adds Autoload Classes
112116 $wgAutoloadClasses['SpecialOptIn'] =
113117 dirname( __FILE__ ) . '/SpecialOptIn.php';
Index: trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.php
@@ -8,7 +8,8 @@
99 * This file contains the include file for the EditWarning portion of the
1010 * UsabilityInitiative extension of MediaWiki.
1111 *
12 - * Usage: This file is included automatically by ../UsabilityInitiative.php
 12+ * Usage: Include the following line in your LocalSettings.php
 13+ * require_once( "$IP/extensions/UsabilityInitiative/EditWarning/EditWarning.php" );
1314 *
1415 * @author Roan Kattouw <roan.kattouw@gmail.com>
1516 * @license GPL v2 or later
@@ -32,6 +33,9 @@
3334 'descriptionmsg' => 'editwarning-desc',
3435 );
3536
 37+// Includes parent extension
 38+require_once( dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative.php" );
 39+
3640 // Adds Autoload Classes
3741 $wgAutoloadClasses['EditWarningHooks'] =
3842 dirname( __FILE__ ) . '/EditWarning.hooks.php';
Index: trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php
@@ -8,7 +8,8 @@
99 * This file contains the include file for the EditWarning portion of the
1010 * UsabilityInitiative extension of MediaWiki.
1111 *
12 - * Usage: This file is included automatically by ../UsabilityInitiative.php
 12+ * Usage: Include the following line in your LocalSettings.php
 13+ * require_once( "$IP/extensions/UsabilityInitiative/PrefStats/PrefStats.php" );
1314 *
1415 * @author Roan Kattouw <roan.kattouw@gmail.com>
1516 * @license GPL v2 or later
@@ -43,6 +44,9 @@
4445 'descriptionmsg' => 'prefstats-desc',
4546 );
4647
 48+// Includes parent extension
 49+require_once( dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative.php" );
 50+
4751 // Adds Autoload Classes
4852 $wgAutoloadClasses['PrefStatsHooks'] =
4953 dirname( __FILE__ ) . '/PrefStats.hooks.php';
Index: trunk/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.php
@@ -8,7 +8,8 @@
99 * This file contains the include file for the NavigableTOC portion of the
1010 * UsabilityInitiative extension of MediaWiki.
1111 *
12 - * Usage: This file is included automatically by ../UsabilityInitiative.php
 12+ * Usage: Include the following line in your LocalSettings.php
 13+ * require_once( "$IP/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.php" );
1314 *
1415 * @author Roan Kattouw <roan.kattouw@gmail.com>
1516 * @license GPL v2 or later
@@ -32,6 +33,9 @@
3334 'descriptionmsg' => 'navigabletoc-desc',
3435 );
3536
 37+// Includes parent extension
 38+require_once( dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative.php" );
 39+
3640 // Adds Autoload Classes
3741 $wgAutoloadClasses['NavigableTOCHooks'] =
3842 dirname( __FILE__ ) . '/NavigableTOC.hooks.php';

Status & tagging log