From: Anomie <bjorsch@wikimedia.org>
Date: Fri, 3 Jan 2014 17:18:20 +0000 (+0000)
Subject: Revert "Declare visibility for class properties in MySQLMasterPos"
X-Git-Tag: 1.31.0-rc.0~17393^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=a399020c6a049da9d346a39cb9aa2a96184c3ffe;p=lhc%2Fweb%2Fwiklou.git

Revert "Declare visibility for class properties in MySQLMasterPos"

These members are accessed from DatabaseMysqlBase::masterPosWait and
DatabaseBase::masterPosWait, causing errors if the wiki has slave
databases or has fakeSlaveLag set.

This reverts commit d0325927d4a7352590e52690aa30ce63fffb6ab8.

Change-Id: I563bde457274dad2f254145426376b275b597e2a
---

diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 3ac7442cfb..31253259f7 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1203,11 +1203,7 @@ class MySQLField implements Field {
 }
 
 class MySQLMasterPos implements DBMasterPos {
-	/** @var string */
-	private $file;
-
-	/** @var int */
-	private $pos;
+	var $file, $pos;
 
 	function __construct( $file, $pos ) {
 		$this->file = $file;