Permalink
Browse files

Merge branch 'w03_MDL-37593_m24_httpslogineditor' of git://github.com…

…/skodak/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents 82cb942 + a8dc59f commit 9f8b8bbd370062b3f87c30f904fb369c7b0fbaa9 @danpoltawski danpoltawski committed Jan 22, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/editor/tinymce/lib.php
@@ -95,12 +95,12 @@ public function head_setup() {
* @param null $fpoptions
*/
public function use_editor($elementid, array $options=null, $fpoptions=null) {
- global $PAGE;
- // Note: use full moodle_url instance to prevent standard JS loader.
+ global $PAGE, $CFG;
+ // Note: use full moodle_url instance to prevent standard JS loader, make sure we are using https on profile page if required.
if (debugging('', DEBUG_DEVELOPER)) {
- $PAGE->requires->js(new moodle_url('/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce_src.js'));
+ $PAGE->requires->js(new moodle_url($CFG->httpswwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce_src.js'));
} else {
- $PAGE->requires->js(new moodle_url('/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce.js'));
+ $PAGE->requires->js(new moodle_url($CFG->httpswwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce.js'));
}
$PAGE->requires->js_init_call('M.editor_tinymce.init_editor', array($elementid, $this->get_init_params($elementid, $options)), true);
if ($fpoptions) {

0 comments on commit 9f8b8bb

Please sign in to comment.