Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle

admin/cli/install.php

@@ -150,6 +150,7 @@ $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
 $CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
+$CFG->developerdebug       = true;
 
 $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);

cache/classes/helper.php

@@ -518,8 +518,9 @@ class cache_helper {
      * @return string
      */
     public static function hash_key($key, cache_definition $definition) {
+        global $CFG;
         if ($definition->uses_simple_keys()) {
-            if (debugging() && preg_match('#[^a-zA-Z0-9_]#', $key)) {
+            if ($CFG->developerdebug && preg_match('#[^a-zA-Z0-9_]#', $key)) {
                 throw new coding_exception('Cache definition '.$definition->get_id().' requires simple keys. Invalid key provided.', $key);
             }
             // We put the key first so that we can be sure the start of the key changes.

install.php

@@ -169,6 +169,7 @@ $CFG->directorypermissions = isset($distro->directorypermissions) ? $distro->dir
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
 $CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
+$CFG->developerdebug       = true;
 
 // Require all needed libs
 require_once($CFG->libdir.'/setuplib.php');

lib/moodlelib.php

@@ -7563,7 +7563,7 @@ function get_string($identifier, $component = '', $a = NULL, $lazyload = false)
         return new lang_string($identifier, $component, $a);
     }
 
-    if (debugging('', DEBUG_DEVELOPER) && clean_param($identifier, PARAM_STRINGID) === '') {
+    if ($CFG->developerdebug && clean_param($identifier, PARAM_STRINGID) === '') {
         throw new coding_exception('Invalid string identifier. The identifier cannot be empty. Please fix your get_string() call.');
     }
 
@@ -11360,6 +11360,7 @@ class lang_string {
      * @param string $lang The language to use when processing the string.
      */
     public function __construct($identifier, $component = '', $a = null, $lang = null) {
+        global $CFG;
         if (empty($component)) {
             $component = 'moodle';
         }
@@ -11397,7 +11398,7 @@ class lang_string {
             }
         }
 
-        if (debugging(false, DEBUG_DEVELOPER)) {
+        if ($CFG->developerdebug) {
             if (clean_param($this->identifier, PARAM_STRINGID) == '') {
                 throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of the string identifier. Please check your string definition');
             }

lib/setup.php

@@ -54,6 +54,13 @@ if (!isset($CFG)) {
     }
 }
 
+// The 'developerdebug' value is relied upon by various functions, so set it
+// immediately (before debugging value is actually known).
+if (!isset($CFG->developerdebug)) {
+    $tempdeveloperdebug = true;
+    $CFG->developerdebug = false;
+}
+
 // We can detect real dirroot path reliably since PHP 4.0.2,
 // it can not be anything else, there is no point in having this in config.php
 $CFG->dirroot = dirname(dirname(__FILE__));
@@ -612,6 +619,9 @@ if ($originalconfigdebug !== null) {
 unset($originalconfigdebug);
 unset($originaldatabasedebug);
 error_reporting($CFG->debug);
+if (!empty($tempdeveloperdebug)) {
+    $CFG->developerdebug = debugging('', DEBUG_DEVELOPER);
+}
 
 // find out if PHP configured to display warnings,
 // this is a security problem because some moodle scripts may

lib/upgrade.txt

@@ -69,6 +69,9 @@ information provided here is intended especially for developers.
   uninstall tool is returned. Unless the plugin type needs extra steps that can't be handled by
   plugininfo_xxx::uninstall() method or xmldb_xxx_uninstall() function, this default URL should
   satisfy all plugin types.
+* New pattern 'if ($CFG->developerdebug) {}' can be used when checking whether to carry
+  out additional sanity checks - faster than debugging('', DEBUG_DEVELOPER), but
+  that still works too.
 
 Database (DML) layer:
 * $DB->sql_empty() is deprecated, you have to use sql parameters with empty values instead,