Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle

diff --cc mod/forum/lib.php
index 5f04287,28cb70a..2265ebe
--- 1/mod/forum/lib.php
--- 2/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@@ -3847,10 -3809,29 +3847,23 @@@ function forum_get_discussion_subscript
                  'data-forumid' => $forum->id,
                  'data-discussionid' => $discussionid,
                  'data-includetext' => $includetext,
 -        ));
 +            ));
      }
 -
 -    if ($includetext) {
 -        $o .= $subscriptionstatus ? get_string('subscribed', 'mod_forum') : get_string('notsubscribed', 'mod_forum');
 -    }
 -
 -    return $o;
  }
  
+ /**
+  * Return a pair of spans containing classes to allow the subscribe and
+  * unsubscribe icons to be pre-loaded by a browser.
+  *
+  * @return string The generated markup
+  */
+ function forum_get_discussion_subscription_icon_preloaders() {
+     $o = '';
+     $o .= html_writer::span(' ', 'preload-subscribe');
+     $o .= html_writer::span(' ', 'preload-unsubscribe');
+     return $o;
+ }
+ 
  /**
   * Print the drop down that allows the user to select how they want to have
   * the discussion displayed.

diff --cc mod/forum/styles.css
index 23e5129,872f28b..a5914d7
--- 1/mod/forum/styles.css
--- 2/mod/forum/styles.css
+++ b/mod/forum/styles.css
@@@ -143,6 -143,19 +143,14 @@@ span.unread 
      float: left;
  }
  
 -.path-mod-forum .discussiontoggle {
 -    display: inline-block;
 -    width: 12px;
 -}
 -
+ .path-mod-forum .preload-subscribe {
+     background: url([[pix:mod_forum|t/subscribed]]) no-repeat -9999px -9999px;
+ }
+ 
+ .path-mod-forum .preload-unsubscribe {
+     background: url([[pix:mod_forum|t/unsubscribed]]) no-repeat -9999px -9999px;
+ }
+ 
  .path-mod-forum .discussionsubscription {
      margin-top: -10px;
      text-align: right;