Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle

2014-10-08 09:53:53 +08:00
parent ec39530d5f 1e31f11852
commit 0d474cb2b4
19 changed files with 35 additions and 21 deletions
@@ -180,7 +180,7 @@ class manager {
    protected static function prepare_cookies() {
        global $CFG;

-        if (!isset($CFG->cookiesecure) or (strpos($CFG->wwwroot, 'https://') !== 0 and empty($CFG->sslproxy))) {
+        if (!isset($CFG->cookiesecure) or (!is_https() and empty($CFG->sslproxy))) {
            $CFG->cookiesecure = 0;
        }