Merge branch 'MDL-32924' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)
lib/phpunit/lib.php

index 179b8f7..ce05ae8 100644 (file)
@@ -432,15 +432,16 @@ class phpunit_util {
     public static function reset_database() {
         global $DB;
 
+        if (!is_null(self::$lastdbwrites) and self::$lastdbwrites == $DB->perf_get_writes()) {
+            return false;
+        }
+
         $tables = $DB->get_tables(false);
         if (!$tables or empty($tables['config'])) {
             // not installed yet
             return false;
         }
 
-        if (!is_null(self::$lastdbwrites) and self::$lastdbwrites == $DB->perf_get_writes()) {
-            return false;
-        }
         if (!$data = self::get_tabledata()) {
             // not initialised yet
             return false;