http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88489
Revision: 88489
Author: platonides
Date: 2011-05-20 21:34:21 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Use the real paths
Modified Paths:
--------------
trunk/tools/code-utils/check-vars.php
Modified: trunk/tools/code-utils/check-vars.php
===================================================================
--- trunk/tools/code-utils/check-vars.php 2011-05-20 21:30:35 UTC (rev
88488)
+++ trunk/tools/code-utils/check-vars.php 2011-05-20 21:34:21 UTC (rev
88489)
@@ -638,25 +638,29 @@
/* Try prepending the
script folder, for maintenance scripts (but see Maintenance.php:758) */
$requirePath = dirname(
$this->mFilename ) . "/" . $requirePath;
}
+
if ( !file_exists( $requirePath
) ) {
if ( strpos(
$requirePath, '$' ) === false ) {
$this->warning(
"Did not found the expected require of $requirePath" );
}
- } else if ( isset(
self::$mRequireKnownClasses[$requirePath] ) ) {
-
$this->mKnownFileClasses = array_merge( $this->mKnownFileClasses,
self::$mRequireKnownClasses[$requirePath] );
- $this->mKnownFunctions
= array_merge( $this->mKnownFunctions,
self::$mRequireKnownFunctions[$requirePath] );
- $this->mConstants =
array_merge( $this->mConstants, self::$mRequireKnownConstants[$requirePath] );
} else {
- $newCheck = new
CheckVars;
- $newCheck->load(
$requirePath, false );
- $newCheck->execute();
- /* Get the classes
defined there */
-
$this->mKnownFileClasses = array_merge( $this->mKnownFileClasses,
$newCheck->mKnownFileClasses );
- $this->mKnownFunctions
= array_merge( $this->mKnownFunctions, $newCheck->mKnownFunctions );
- $this->mConstants =
array_merge( $this->mConstants, $newCheck->mConstants );
-
self::$mRequireKnownClasses[$requirePath] = $newCheck->mKnownFileClasses;
-
self::$mRequireKnownFunctions[$requirePath] = $newCheck->mKnownFunctions;
-
self::$mRequireKnownConstants[$requirePath] = $newCheck->mConstants;
+ $requirePath =
realpath( $requirePath );
+ if ( isset(
self::$mRequireKnownClasses[$requirePath] ) ) {
+
$this->mKnownFileClasses = array_merge( $this->mKnownFileClasses,
self::$mRequireKnownClasses[$requirePath] );
+
$this->mKnownFunctions = array_merge( $this->mKnownFunctions,
self::$mRequireKnownFunctions[$requirePath] );
+
$this->mConstants = array_merge( $this->mConstants,
self::$mRequireKnownConstants[$requirePath] );
+ } else {
+ $newCheck = new
CheckVars;
+
$newCheck->load( $requirePath, false );
+
$newCheck->execute();
+ /* Get the
classes defined there */
+
$this->mKnownFileClasses = array_merge( $this->mKnownFileClasses,
$newCheck->mKnownFileClasses );
+
$this->mKnownFunctions = array_merge( $this->mKnownFunctions,
$newCheck->mKnownFunctions );
+
$this->mConstants = array_merge( $this->mConstants, $newCheck->mConstants );
+
self::$mRequireKnownClasses[$requirePath] = $newCheck->mKnownFileClasses;
+
self::$mRequireKnownFunctions[$requirePath] = $newCheck->mKnownFunctions;
+
self::$mRequireKnownConstants[$requirePath] = $newCheck->mConstants;
+ }
}
$this->mStatus = $this->mStatus
- self::IN_REQUIRE_WAITING;
continue;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
