From: Marius Hoch <hoo@online.de>
Date: Thu, 4 Dec 2014 22:14:00 +0000 (+0100)
Subject: Fix DatabaseBase::replaceVars for PHP 5.3
X-Git-Tag: 1.31.0-rc.0~13079
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=3d3d36fcdd6fbeeb43b38c551c7a2810b5290606;p=lhc%2Fweb%2Fwiklou.git

Fix DatabaseBase::replaceVars for PHP 5.3

Change-Id: I78a535abfe3f444b2ccb99638a63b6f16c9f18af
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index a805fa5e03..6c53f6a16e 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2423,12 +2423,16 @@ abstract class DatabaseBase implements IDatabase {
 	}
 
 	/**
-	 * Get the name of an index in a given table
+	 * Get the name of an index in a given table.
 	 *
+	 * @protected Don't use outside of DatabaseBase and childs
 	 * @param string $index
 	 * @return string
 	 */
-	protected function indexName( $index ) {
+	public function indexName( $index ) {
+		// @FIXME: Make this protected once we move away from PHP 5.3
+		// Needs to be public because of usage in closure (in DatabaseBase::replaceVars)
+
 		// Backwards-compatibility hack
 		$renamed = array(
 			'ar_usertext_timestamp' => 'usertext_timestamp',