Merge branch 'master_MDL-41806' of git://github.com/totara/moodle

[moodle.git] / lib / weblib.php

diff --git a/lib/weblib.php b/lib/weblib.php
index 95dc03a..844fd5c 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1827,9 +1827,10 @@ function markdown_to_html($text) {
         return $text;
     }
 
         return $text;
     }
 

-    require_once($CFG->libdir .'/markdown.php');
+    require_once($CFG->libdir .'/markdown/Markdown.php');
+    require_once($CFG->libdir .'/markdown/MarkdownExtra.php');

 
 

-    return Markdown($text);
+    return \Michelf\MarkdownExtra::defaultTransform($text);

 }
 
 /**
 }
 
 /**


@@ -2621,12 +2622,11 @@ function redirect($url, $message='', $delay=-1) {
         }
     }
 
         }
     }
 

-    if ($delay == 0 && !$debugdisableredirect && !headers_sent()) {
-        // Workaround for IIS bug http://support.microsoft.com/kb/q176113/.
-        if (session_id()) {
-            session_get_instance()->write_close();
-        }
+    // Make sure the session is closed properly, this prevents problems in IIS
+    // and also some potential PHP shutdown issues.
+    \core\session\manager::write_close();

 
 

+    if ($delay == 0 && !$debugdisableredirect && !headers_sent()) {

         // 302 might not work for POST requests, 303 is ignored by obsolete clients.
         @header($_SERVER['SERVER_PROTOCOL'] . ' 303 See Other');
         @header('Location: '.$url);
         // 302 might not work for POST requests, 303 is ignored by obsolete clients.
         @header($_SERVER['SERVER_PROTOCOL'] . ' 303 See Other');
         @header('Location: '.$url);