Fix this broken crap some more

[lhc/web/wiklou.git] / maintenance / parserTests.inc

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 71cb336..5c7ed47 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -622,7 +622,9 @@ class ParserTest {
                $this->oldTablePrefix = $wgDBprefix;
 
                # CREATE TEMPORARY TABLE breaks if there is more than one server
-               if ( wfGetLB()->getServerCount() != 1 ) {
+               # FIXME: r40209 makes temporary tables break even with just one server
+               # FIXME: (bug 15892); disabling the feature entirely as a temporary fix
+               if ( true || wfGetLB()->getServerCount() != 1 ) {
                        $this->useTemporaryTables = false;
                }
 
@@ -793,7 +795,6 @@ class ParserTest {
        private function teardownGlobals() {
                RepoGroup::destroySingleton();
                LinkCache::singleton()->clear();
-               $GLOBALS['wgLang']->__destruct();
                foreach( $this->savedGlobals as $var => $val ) {
                        $GLOBALS[$var] = $val;
                }