diff --git a/lib/defaults.php b/lib/defaults.php
index 0f3c14d23bf..977f07a5cd9 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -71,15 +71,15 @@
        'notifyloginthreshold'     =>  10,
        'opentogoogle'             =>  false,
        'pathtoclam'               => '',
-       'pathtodu'                 => '', 
+       'pathtodu'                 => '',
        'prefix'                   => '',
        'perfdebug'                => 0,
        'proxyhost'                => '',
        'proxyport'                => '',
        'quarantinedir'            => '',
-       'requestedteachername'     => '',  
+       'requestedteachername'     => '',
        'requestedteachersname'    => '',
-       'requestedstudentname'     => '', 
+       'requestedstudentname'     => '',
        'requestedstudentsname'    => '',
        'restrictmodulesfor'       =>  'none',
        'restrictbydefault'        =>  0,
@@ -106,6 +106,11 @@
        'theme'                    => 'standardwhite',
        'themelist'                => '',
        'timezone'                 =>  99,
+       'tinymceplugins'           => 'advimage,fullscreen',
+       'tinymcetheme'             => 'advanced',
+       'tinymcecontentcss'        => $CFG->httpswwwroot .'/lib/editor/tinymce/moodlecontent.css',
+       'tinymcepopupcss'          => '',
+       'tinymceeditorcss'         => '',
        'unzip'                    => '',
        'zip'                      => ''
     );
diff --git a/lib/javascript.php b/lib/javascript.php
index 932e43e4959..3692b28b9a4 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -8,6 +8,13 @@
     if(!empty($CFG->aspellpath)) {      // Enable global access to spelling feature.
         echo '<script language="JavaScript" type="text/javascript" src="'.$CFG->httpswwwroot.'/lib/speller/spellChecker.js"></script>'."\n";
     }
+
+    if ( !empty($CFG->editorsrc) ) {
+        foreach ( $CFG->editorsrc as $scriptsource ) {
+            echo '<script language="javascript" type="text/javascript" src="'. $scriptsource .'"></script>'."\n";
+        }
+    }
+
 ?>
 <!--<style type="text/css">/*<![CDATA[*/ body{behavior:url(<?php echo $CFG->httpswwwroot ?>/lib/csshover.htc);} /*]]>*/</style>-->