Merged XHTML fixes from stable

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index d73c72f6bbf2a529f0f9e37ba4e84592e1ebbc97..fe4155359a34d460ac84426bae87dfd88c0e1654 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2199,7 +2199,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring=""
                     echo '</a>';
                     echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
                          $forum->id.'&amp;d='.$post->discussion.'&amp;mark=read&amp;returnpage=view.php">' .
-                         '<img src="'.$CFG->pixpath.'/t/clear.gif" height="11" width="11" /></a>';
+                         '<img src="'.$CFG->pixpath.'/t/clear.gif" height="11" width="11" alt="" /></a>';
                     echo '</span>';
                 } else {
                     echo '<span class="read">';
@@ -3155,7 +3155,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
         $numdiscussions = count($discussions);
 
         ///Show the paging bar
-        print_paging_bar($numdiscussions, $page, $maxdiscussions, "view.php?f=$forum->id&");
+        print_paging_bar($numdiscussions, $page, $maxdiscussions, "view.php?f=$forum->id&amp;");
 
         //Calculate the page "window"
         $pagestart = ($page * $maxdiscussions) + 1;
@@ -3197,7 +3197,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
                     echo '&nbsp;<a title="'.get_string('markallread', 'forum').
                          '" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
                          $forum->id.'&amp;mark=read&amp;returnpage=view.php">'.
-                         '<img src="'.$CFG->pixpath.'/t/clear.gif" height="11" width="11" border="0" /></a>';
+                         '<img src="'.$CFG->pixpath.'/t/clear.gif" height="11" width="11" border="0" alt="" /></a>';
                 }
                 echo '</th>';
             }
@@ -3288,7 +3288,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
     }
 
     if ($page != -1) { ///Show the paging bar
-        print_paging_bar($numdiscussions, $page, $maxdiscussions, "view.php?f=$forum->id&");
+        print_paging_bar($numdiscussions, $page, $maxdiscussions, "view.php?f=$forum->id&amp;");
     }
 }
 

diff --git a/mod/forum/view.php b/mod/forum/view.php
index efa184ab64a5bb594067d13c96231aaa3aa31abf..73a89d99fab19eb3302d29ff86f6f2c20c351d69 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -202,11 +202,11 @@
             if (forum_tp_is_tracked($forum, $USER->id)) {
                 $trtitle = get_string('notrackforum', 'forum');
                 $trackedlink = '<a title="'.get_string('notrackforum', 'forum').'" href="settracking.php?id='.
-                               $forum->id.'&returnpage=view.php">'.get_string('forumtracked', 'forum').'</a>';
+                               $forum->id.'&amp;returnpage=view.php">'.get_string('forumtracked', 'forum').'</a>';
             } else {
                 $trtitle = get_string('trackforum', 'forum');
                 $trackedlink = '<a title="'.get_string('trackforum', 'forum').'" href="settracking.php?id='.
-                               $forum->id.'&returnpage=view.php">'.get_string('forumtrackednot', 'forum').'</a>';
+                               $forum->id.'&amp;returnpage=view.php">'.get_string('forumtrackednot', 'forum').'</a>';
             }
             echo "<br />";
             echo "<span class=\"helplink\">$trackedlink</span>";