merged fix for MDL-6926

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 3f4af44ecfb11e424dafe508c0bab08a8d37d578..ce8ee11444cf43598876c9f2c6c0707b1b550320 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2410,7 +2410,10 @@ function forum_print_rating_menu($postid, $userid, $scale) {
  * @param $forumtype - optional
  */
 function forum_print_mode_form($id, $mode, $forumtype='') {
-    GLOBAL $FORUM_LAYOUT_MODES;
+    $FORUM_LAYOUT_MODES = array ( FORUM_MODE_FLATOLDEST => get_string('modeflatoldestfirst', 'forum'),
+                              FORUM_MODE_FLATNEWEST => get_string('modeflatnewestfirst', 'forum'),
+                              FORUM_MODE_THREADED   => get_string('modethreaded', 'forum'),
+                              FORUM_MODE_NESTED     => get_string('modenested', 'forum') );
 
     echo "<div align=\"center\">";
     if ($forumtype == 'single') {