MDL-8119 : Improvements to logging where Mnet hosts are involved

Merged from MOODLE_18_STABLE

diff --git a/course/lib.php b/course/lib.php
index e53aeea90cb8e885b8d2b1d25a05de8274e09496..48ec9e4a29a2db8a709fc47073bd2352a568e036 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -243,6 +243,9 @@ function make_log_url($module, $url) {
         case 'admin':
         case 'message':
         case 'calendar':
+        case 'mnet course':
+            return "/course/$url";
+            break;
         case 'blog':
             return "/$module/$url";
             break;
@@ -508,7 +511,11 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
         echo '<tr class="r'.$row.'">';
         if ($course->id == SITEID) {
             echo "<td class=\"cell c0\">\n";
-            echo "    <a href=\"{$CFG->wwwroot}/course/view.php?id={$log->course}\">". format_string($courses[$log->course])."</a>\n";
+            if (empty($log->course)) {
+                echo format_string($log->info)."\n";
+            } else {
+                echo "    <a href=\"{$CFG->wwwroot}/course/view.php?id={$log->course}\">". format_string($courses[$log->course])."</a>\n";
+            }
             echo "</td>\n";
         }
         echo "<td class=\"cell c1\" align=\"right\">".userdate($log->time, '%a').