r77811 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77810‎ | r77811 | r77812 >
Date:16:54, 5 December 2010
Author:catrope
Status:deferred
Tags:
Comment:
Fix r76983: move $dir too, otherwise this has really funky interactions with the extension included right before
Modified paths:
  • /trunk/extensions/ArticleFeedback/ArticleFeedback.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedback/ArticleFeedback.php
@@ -11,7 +11,7 @@
1212 */
1313
1414 /* XXX: Survey setup */
15 -
 15+$dir = dirname( __FILE__ ) . '/';
1616 require_once( $dir . '../SimpleSurvey/SimpleSurvey.php' );
1717
1818 /* Configuration */
@@ -82,7 +82,6 @@
8383 'descriptionmsg' => 'articlefeedback-desc',
8484 'url' => 'http://www.mediawiki.org/wiki/Extension:ArticleFeedback'
8585 );
86 -$dir = dirname( __FILE__ ) . '/';
8786 // Autoloading
8887 $wgAutoloadClasses['ApiQueryArticleFeedback'] = $dir . 'api/ApiQueryArticleFeedback.php';
8988 $wgAutoloadClasses['ApiArticleFeedback'] = $dir . 'api/ApiArticleFeedback.php';

Follow-up revisions

RevisionCommit summaryAuthorDate
r77814Fix r77811: $dir doesn't work so well up there either, because SimpleSurvey.p...catrope17:01, 5 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76983Moved survey include to the top, so that $wgPrefSwitchSurveys can be properly...tparscal23:01, 18 November 2010

Status & tagging log