MDL-10947 https was replaced with httpss when wwwroot already is https credit goes...

diff --git a/mod/choice/view.php b/mod/choice/view.php
index e5364dade868c4cd9c3265234963ebf8ee32909c..7249de62e65262841c2fb6d7e22e4c77eb355f7b 100644 (file)
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -122,7 +122,7 @@ if ($action == 'delchoice') {
         if (has_capability('moodle/legacy:guest', $sitecontext, NULL, false)) {      // Guest on whole site
             $wwwroot = $CFG->wwwroot.'/login/index.php';
             if (!empty($CFG->loginhttps)) {
-                $wwwroot = str_replace('http','https', $wwwroot);
+                $wwwroot = str_replace('http:','https:', $wwwroot);
             }
             notice_yesno(get_string('noguestchoose', 'choice').'<br /><br />'.get_string('liketologin'),
                          $wwwroot, $_SERVER['HTTP_REFERER']);

diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php
index e8899ab164916ce5ea558743fee3a77a346a5677..5b859fd9a960f0f39a0430f9006630d4c2d957b5 100644 (file)
--- a/mod/forum/markposts.php
+++ b/mod/forum/markposts.php
@@ -29,7 +29,7 @@
     if (isguest()) {   // Guests can't change forum
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http','https', $wwwroot);
+            $wwwroot = str_replace('http:','https:', $wwwroot);
         }
 
         $strforums = get_string('modulenameplural', 'forum');

diff --git a/mod/forum/post.php b/mod/forum/post.php
index 8b643d4a1eb7b6e85284d8d7ca55835609cf6ee2..0092e19e32c962e5ba375ecd988e43bc6176c0f8 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -24,7 +24,7 @@
 
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http', 'https', $wwwroot);
+            $wwwroot = str_replace('http:', 'https:', $wwwroot);
         }
 
         if (!empty($forum)) {      // User is starting a new discussion in a forum

diff --git a/mod/forum/settracking.php b/mod/forum/settracking.php
index e1d7517507e975894f8ef6ed92e7b68c8d59277c..766ad927bfb1c5beaf4318f76904cc8db60279f5 100644 (file)
--- a/mod/forum/settracking.php
+++ b/mod/forum/settracking.php
@@ -27,7 +27,7 @@
     if (isguest()) {   // Guests can't change tracking
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http','https', $wwwroot);
+            $wwwroot = str_replace('http:','https:', $wwwroot);
         }
 
         $strforums = get_string('modulenameplural', 'forum');

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 03a665b4144cd5094f7d12a17c1503a6adf8d077..6baad93c689a138494f685df28f4877c3fad457a 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -48,7 +48,7 @@
     if (isguest()) {   // Guests can't subscribe
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http','https', $wwwroot);
+            $wwwroot = str_replace('http:','https:', $wwwroot);
         }
         
         $strforums = get_string('modulenameplural', 'forum');