Print view isn't accesible if the activity is hidden.

Bug 1837
(http://moodle.org/bugs/bug.php?op=show&bugid=1837)

Merged from MOODLE_14_STABLE

diff --git a/mod/glossary/print.php b/mod/glossary/print.php
index 41824631ca13387906ae5b03619169036fd38873..326120cedd889884d6aa473e1ef8c8b21e95608b 100644 (file)
--- a/mod/glossary/print.php
+++ b/mod/glossary/print.php
@@ -41,6 +41,10 @@
 
     require_course_login($course);
 
+    if (!$cm->visible and !isteacher($course->id)) {
+        notice(get_string("activityiscurrentlyhidden"));
+    }
+
 /// setting the default values for the display mode of the current glossary
 /// only if the glossary is viewed by the first time
     if ( $dp = get_record('glossary_formats','name', $glossary->displayformat) ) {

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 24999275658c75c59a8217998442ed0478ef90f8..b7496ec415f75265d692e22bcb7d20aebe17a9d2 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -111,6 +111,7 @@
         require_login($course->id);
     }
     if (!$cm->visible and !isteacher($course->id)) {
+        print_header();
         notice(get_string("activityiscurrentlyhidden"));
     } 
     add_to_log($course->id, "glossary", "view", "view.php?id=$cm->id&tab=$tab", $glossary->id, $cm->id);