From: Markus Glaser <mglaser@users.mediawiki.org>
Date: Tue, 19 Oct 2010 19:58:58 +0000 (+0000)
Subject: Follow up r74753, removed pass-by-references and @ operator
X-Git-Tag: 1.31.0-rc.0~34418
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=e43a1490c868c3ac564c0ea13cc68a0118934870;p=lhc%2Fweb%2Fwiklou.git

Follow up r74753, removed pass-by-references and @ operator
---

diff --git a/maintenance/tests/selenium/SeleniumServerManager.php b/maintenance/tests/selenium/SeleniumServerManager.php
index 7abb34b1db..5ef4c6649d 100644
--- a/maintenance/tests/selenium/SeleniumServerManager.php
+++ b/maintenance/tests/selenium/SeleniumServerManager.php
@@ -179,12 +179,13 @@ class SeleniumServerManager {
 				// on its port. Note: this solution kinda
 				// stinks, since it uses a wait loop - dnessett
 
+				wfSuppressWarnings();
 				for ( $cnt = 1;
 				      $cnt <= $this->SeleniumServerStartTimeout;
 				      $cnt++ ) {
-					$fp = @fsockopen ( 'localhost',
+					$fp = fsockopen ( 'localhost',
 						$this->SeleniumServerPort,
-						&$errno, &$errstr, 0 );
+						$errno, $errstr, 0 );
 					if ( !$fp ) {
 						sleep( 1 );
 						continue;
@@ -194,6 +195,7 @@ class SeleniumServerManager {
 						return 'started';
 					}
 				}
+				wfRestoreWarnings();
 				echo ( "Starting Selenium server timed out.\n" );
 				return 'failed';
 			}