From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 18 Jan 2010 13:02:39 +0000 (+0000)
Subject: Fix stupid r61199, unrelated changes checkin
X-Git-Tag: 1.31.0-rc.0~38215
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=58f5fbfb5d915b3138a69eba0a8863994adc1ae3;p=lhc%2Fweb%2Fwiklou.git

Fix stupid r61199, unrelated changes checkin
---

diff --git a/maintenance/install-utils.inc b/maintenance/install-utils.inc
index 586e260c2d..1d018a606a 100644
--- a/maintenance/install-utils.inc
+++ b/maintenance/install-utils.inc
@@ -48,9 +48,8 @@ function install_version_checks() {
 	call_user_func_array( array( $test, 'test' ), array( &$ok ) );
 	if ( !$ok ) {
 		echo "PHP " . phpversion() . " is not compatible with MediaWiki due to a bug involving\n" .
-			"reference parameters to __call in PHP versions 5.3.1, 5.2.12 and 5.2.11.\n" .
-			"Upgrade to PHP 5.3.2 (5.2.13 for 5.2 users), or downgrade\n" .
-			"to PHP 5.3.0 (5.2.10 for 5.2 users) to fix this.\n" .
+			"reference parameters to __call. Upgrade to PHP 5.3.2, or downgrade\n" .
+			"to PHP 5.3.0. to fix this.\n" .
 			"ABORTING (see http://bugs.php.net/bug.php?id=50394 for details)\n";
 		die( 1 );
 	}
diff --git a/maintenance/syntaxChecker.php b/maintenance/syntaxChecker.php
index 64f9a36a1e..bbd968c24e 100644
--- a/maintenance/syntaxChecker.php
+++ b/maintenance/syntaxChecker.php
@@ -274,7 +274,6 @@ class SyntaxChecker extends Maintenance {
 		$this->checkRegex( $file, $text, '/^[\s\r\n]+<\?/', 'leading whitespace' );
 		$this->checkRegex( $file, $text, '/\?>[\s\r\n]*$/', 'trailing ?>' );
 		$this->checkRegex( $file, $text, '/^[\xFF\xFE\xEF]/', 'byte-order mark' );
-		$this->checkRegex( $file, $text, '/\&\$this/', 'passing $this by reference' );
 	}
 
 	private function checkRegex( $file, $text, $regex, $desc ) {