Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

Conflicts: lib/upgrade.txt
2013-08-20 11:42:03 +08:00
parent 8ab325fb00 96f81ea385
commit 6f44a73369
43 changed files with 192 additions and 185 deletions
@@ -594,6 +594,7 @@ class phpunit_util extends testing_util {
     */
    public static function reset_debugging() {
        self::$debuggings = array();
+        set_debugging(DEBUG_DEVELOPER);
    }

    /**