jenkins-bot has submitted this change and it was merged.
Change subject: Fix DatabaseBase::replaceVars for PHP 5.3
......................................................................
Fix DatabaseBase::replaceVars for PHP 5.3
Change-Id: I78a535abfe3f444b2ccb99638a63b6f16c9f18af
---
M includes/db/Database.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/Database.php b/includes/db/Database.php
index a805fa5..6c53f6a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2423,12 +2423,16 @@
}
/**
- * 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',
--
To view, visit https://gerrit.wikimedia.org/r/177671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78a535abfe3f444b2ccb99638a63b6f16c9f18af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
