aboutsummaryrefslogtreecommitdiffstats
path: root/includes/filerepo/backend/lockmanager
diff options
context:
space:
mode:
authorTim Starling <tstarling@users.mediawiki.org>2012-03-20 00:28:30 +0000
committerTim Starling <tstarling@users.mediawiki.org>2012-03-20 00:28:30 +0000
commita654a6e79adc8f4730bb69f79e0b6a960d7d3cbe (patch)
tree0184a11a46715c3d02d36993c37defd8dc1abd0a /includes/filerepo/backend/lockmanager
parent3cad6eb042b2e9d783654f737e2c230f53933eb4 (diff)
downloadmediawikicore-a654a6e79adc8f4730bb69f79e0b6a960d7d3cbe.tar.gz
mediawikicore-a654a6e79adc8f4730bb69f79e0b6a960d7d3cbe.zip
Fixed attempt to write to the wiki's upload directory during parser tests instead of /tmp, this is not allowed. I'm not sure what setupGlobals() is meant to do nowadays, that part is untested. It seems to be duplicated in ParserTest::__construct().
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/114224
Diffstat (limited to 'includes/filerepo/backend/lockmanager')
-rw-r--r--includes/filerepo/backend/lockmanager/LockManagerGroup.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/includes/filerepo/backend/lockmanager/LockManagerGroup.php b/includes/filerepo/backend/lockmanager/LockManagerGroup.php
index 11e77972f8f5..5e533667e79e 100644
--- a/includes/filerepo/backend/lockmanager/LockManagerGroup.php
+++ b/includes/filerepo/backend/lockmanager/LockManagerGroup.php
@@ -31,6 +31,14 @@ class LockManagerGroup {
}
/**
+ * Destroy the singleton instance, so that a new one will be created next
+ * time singleton() is called.
+ */
+ public static function destroySingleton() {
+ self::$instance = null;
+ }
+
+ /**
* Register lock managers from the global variables
*
* @return void