Merge branch 'MDL-58691-32' of git://github.com/ankitagarwal/moodle into MOODLE_32_STABLE

2017-04-27 11:26:52 +08:00
parent f8ca828c02 c51e98722b
commit 2e95bfa5f2
1 changed files with 1 additions and 1 deletions
@@ -1137,7 +1137,7 @@ class external_settings {
     * Constructor - protected - can not be instanciated
     */
    protected function __construct() {
-        if (!defined('AJAX_SCRIPT') && !defined('CLI_SCRIPT') && !defined('WS_SERVER')) {
+        if ((AJAX_SCRIPT == false) && (CLI_SCRIPT == false) && (WS_SERVER == false)) {
            // For normal pages, the default should match the default for format_text.
            $this->filter = true;
        }