Backport r63656, r63658 to REL1_161.16.0beta1

2 files changed, 15 insertions, 2 deletions

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 4de8cda7d554..cecb53f912a7 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -664,6 +664,17 @@ class AutoLoader {
 			}
 		}
 	}
+
+	/**
+	 * Force a class to be run through the autoloader, helpful for things like
+	 * Sanitizer that have define()s outside of their class definition. Of course
+	 * this wouldn't be necessary if everything in MediaWiki was class-based. Sigh.
+	 *
+	 * @return Boolean Return the results of class_exists() so we know if we were successful
+	 */
+	static function loadClass( $class ) {
+		return class_exists( $class );
+	}
 }
 
 function wfLoadAllExtensions() {
diff --git a/maintenance/tests/SanitizerTest.php b/maintenance/tests/SanitizerTest.php
index 6fb9d5a59b43..8a2287d55891 100644
--- a/maintenance/tests/SanitizerTest.php
+++ b/maintenance/tests/SanitizerTest.php
@@ -1,10 +1,12 @@
 <?php
 
-global $IP;
-require_once( "$IP/includes/Sanitizer.php" );
 
 class SanitizerTest extends PHPUnit_Framework_TestCase {
 
+	function setUp() {
+		AutoLoader::loadClass( 'Sanitizer' );
+	}
+
 	function testDecodeNamedEntities() {
 		$this->assertEquals(
 			"\xc3\xa9cole",