r62359 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62358‎ | r62359 | r62360 >
Date:11:43, 12 February 2010
Author:demon
Status:deferred
Tags:
Comment:
Cleanup r62179: Use proper path detection like with other CL entry points, remove commented bogus include_path changes that typically fail anyway
Modified paths:
  • /trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php (modified) (history)

Diff [purge]

Index: trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
@@ -6,13 +6,13 @@
77 * - Upload multipage.tiff when PagedTiffHandler is active
88 */
99
10 -try {
11 - require_once( dirname(__FILE__) . '/../../../maintenance/commandLine.inc' );
 10+if ( getenv( 'MW_INSTALL_PATH' ) ) {
 11+ $IP = getenv( 'MW_INSTALL_PATH' );
 12+} else {
 13+ $IP = dirname( __FILE__ ) . '/../../..';
1214 }
13 -catch(Exception $e) {
14 - require_once( dirname(__FILE__) . '/../../../phase3/maintenance/commandLine.inc' );
15 -}
16 -// ini_set( 'include_path', get_include_path() . PATH_SEPARATOR . /*$_SERVER['PHP_PEAR_INSTALL_DIR']*/ 'C:\php\pear' );
 15+require_once( "$IP/maintenance/commandLine.inc" );
 16+
1717 // requires PHPUnit 3.4
1818 require_once 'PHPUnit/Framework.php';
1919

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r62179adapted include of commandLine to phase3; commented out PEAR include and corr...mglaser10:54, 9 February 2010

Status & tagging log