r85944 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85943‎ | r85944 | r85945 >
Date:13:09, 13 April 2011
Author:reedy
Status:resolved (Comments)
Tags:
Comment:
Related to bug 28470 (Doxygen not updating)

Move require_once( MWInit::compiledPath( 'includes/normal/UtfNormalDefines.php' ) ); to Setup.php

Might want relocating in Setup.php though
Modified paths:
  • /trunk/phase3/includes/Setup.php (modified) (history)
  • /trunk/phase3/includes/normal/UtfNormalUtil.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Setup.php
@@ -453,6 +453,8 @@
454454 wfProfileOut( $profName );
455455 }
456456
 457+require_once( MWInit::compiledPath( 'includes/normal/UtfNormalDefines.php' ) );
 458+
457459 // For compatibility
458460 wfRunHooks( 'LogPageValidTypes', array( &$wgLogTypes ) );
459461 wfRunHooks( 'LogPageLogName', array( &$wgLogNames ) );
Index: trunk/phase3/includes/normal/UtfNormalUtil.php
@@ -25,8 +25,6 @@
2626 * @ingroup UtfNormal
2727 */
2828
29 -require_once( MWInit::compiledPath( 'includes/normal/UtfNormalDefines.php' ) );
30 -
3129 /**
3230 * Return UTF-8 sequence for a given Unicode code point.
3331 * May die if fed out of range data.

Follow-up revisions

RevisionCommit summaryAuthorDate
r86087Followup r85944, move UtfNormalDefins stuff out of extensions profiling areareedy21:21, 14 April 2011
r87748(bug 28864) Fix UtfNormal benchmark & test case runners from regression in r8......brion17:43, 9 May 2011

Comments

#Comment by Brion VIBBER (talk | contribs)   17:44, 9 May 2011

Note that r87748 restores the original version of the require_once line (without the MWInit::compiledPath call added in r85327 which caused it to simply break 100% on the generator, test, and benchmark code which does not depend on the rest of MediaWiki). This doesn't seem to have any problems with regular MediaWiki -- as the file is already now included from Setup.php -- but it might have some effect on HipHop builds, untested. Please double-check affected features.

Status & tagging log