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
@@ -195,12 +195,9 @@ class core_component {
    protected static function is_developer() {
        global $CFG;

+        // Note we can not rely on $CFG->debug here because DB is not initialised yet.
        if (isset($CFG->config_php_settings['debug'])) {
-            // Standard moodle script.
            $debug = (int)$CFG->config_php_settings['debug'];
-        } else if (isset($CFG->debug)) {
-            // Usually script with ABORT_AFTER_CONFIG.
-            $debug = (int)$CFG->debug;
        } else {
            return false;
        }