r77814 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77813‎ | r77814 | r77815 >
Date:17:01, 5 December 2010
Author:catrope
Status:deferred
Tags:
Comment:
Fix r77811: $dir doesn't work so well up there either, because SimpleSurvey.php overwrites it :( . Put $dir back where it was, and use __FILE__
Modified paths:
  • /trunk/extensions/ArticleFeedback/ArticleFeedback.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedback/ArticleFeedback.php
@@ -11,8 +11,7 @@
1212 */
1313
1414 /* XXX: Survey setup */
15 -$dir = dirname( __FILE__ ) . '/';
16 -require_once( $dir . '../SimpleSurvey/SimpleSurvey.php' );
 15+require_once( dirname( dirname( __FILE__ ) ) . '/SimpleSurvey/SimpleSurvey.php' );
1716
1817 /* Configuration */
1918
@@ -83,6 +82,7 @@
8483 'url' => 'http://www.mediawiki.org/wiki/Extension:ArticleFeedback'
8584 );
8685 // Autoloading
 86+$dir = dirname( __FILE__ ) . '/';
8787 $wgAutoloadClasses['ApiQueryArticleFeedback'] = $dir . 'api/ApiQueryArticleFeedback.php';
8888 $wgAutoloadClasses['ApiArticleFeedback'] = $dir . 'api/ApiArticleFeedback.php';
8989 $wgAutoloadClasses['ArticleFeedbackHooks'] = $dir . 'ArticleFeedback.hooks.php';

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77811Fix r76983: move $dir too, otherwise this has really funky interactions with ...catrope16:54, 5 December 2010

Status & tagging log