Browse files

Merge branch 'w15_MDL-27069_m19_httpsrequired' of git://github.com/sk…

…odak/moodle into MOODLE_19_STABLE
  • Loading branch information...
2 parents 697664c + 7e58c03 commit bd492232462a8a98ac90dbf914ab9f9a1f32661b @stronk7 stronk7 committed Apr 11, 2011
Showing with 3 additions and 0 deletions.
  1. +1 −0 lib/editor/htmlarea/popups/insert_image.php
  2. +2 −0 lib/editor/htmlarea/popups/insert_image_std.php
View
1 lib/editor/htmlarea/popups/insert_image.php
@@ -3,6 +3,7 @@
require("../../../../config.php");
$id = optional_param('id', SITEID, PARAM_INT);
+ $httpsrequired = optional_param('httpsrequired', 0, PARAM_BOOL);
require_login($id);
require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));
View
2 lib/editor/htmlarea/popups/insert_image_std.php
@@ -2,8 +2,10 @@
require("../../../../config.php");
$id = optional_param('id', SITEID, PARAM_INT);
+ $httpsrequired = optional_param('httpsrequired', 0, PARAM_BOOL);
require_course_login($id);
+
@header('Content-Type: text/html; charset=utf-8');
if ($httpsrequired or (!empty($_SERVER['HTTPS']) and $_SERVER['HTTPS'] != 'off')) {

0 comments on commit bd49223

Please sign in to comment.