MDL-14741: Fix to prevent problems when using the htmledit on a https-enabled site

diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php
index bf1e0a9e40c7dea73eeaa9aef54fbeb152316c4a..d1f85e18d932fb7b6f04fc2b82165b0c5341ccf5 100644 (file)
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php
@@ -218,7 +218,7 @@ form { margin-bottom: 0px; margin-top: 0px; }
       <td width="55%" valign="top"><?php\r
           print_string("filebrowser","editor");\r
           echo "<br />";\r
-          echo "<iframe id=\"ibrowser\" name=\"ibrowser\" src=\"{$CFG->wwwroot}/lib/editor/tinymce/coursefiles.php?usecheckboxes=1&id=$id\" style=\"width: 100%; height: 200px;\"></iframe>";\r
+          echo "<iframe id=\"ibrowser\" name=\"ibrowser\" src=\"{$CFG->httpswwwroot}/lib/editor/tinymce/coursefiles.php?usecheckboxes=1&id=$id\" style=\"width: 100%; height: 200px;\"></iframe>";\r
       ?>\r
       </td>\r
       <td width="45%" valign="top"><?php print_string("preview","editor");?>:<br />\r
@@ -265,7 +265,7 @@ form { margin-bottom: 0px; margin-top: 0px; }
     </tr>\r
     <tr>\r
       <td height="22">\r
-          <form id="cfolder" action="<?php echo $CFG->wwwroot;?>/lib/editor/tinymce/coursefiles.php" method="post" target="ibrowser">\r
+          <form id="cfolder" action="<?php echo $CFG->httpswwwroot;?>/lib/editor/tinymce/coursefiles.php" method="post" target="ibrowser">\r
           <input type="hidden" name="id" value="<?php print($id);?>" />\r
           <input type="hidden" name="wdir" value="" />\r
           <input type="hidden" name="action" value="mkdir" />\r
@@ -276,7 +276,7 @@ form { margin-bottom: 0px; margin-top: 0px; }
           \r
           </form>\r
           <div class="space"></div>\r
-          <form action="<?php echo $CFG->wwwroot;?>/lib/editor/tinymce/coursefiles.php?id=<?php print($id);?>" method="post" enctype="multipart/form-data" target="ibrowser" id="uploader">\r
+          <form action="<?php echo $CFG->httpswwwroot;?>/lib/editor/tinymce/coursefiles.php?id=<?php print($id);?>" method="post" enctype="multipart/form-data" target="ibrowser" id="uploader">\r
           <input type="hidden" name="MAX_FILE_SIZE" value="<?php print($upload_max_filesize);?>" />\r
           <input type="hidden" name="id" VALUE="<?php print($id);?>" />\r
           <input type="hidden" name="wdir" value="" />\r