Fixed bug in subscribe link

diff --git a/course/social.php b/course/social.php
index 4c08863e977204d4afe72c3858264e57516c2bc7..8efa334f790b517377070fbec2155d65010b2089 100644 (file)
--- a/course/social.php
+++ b/course/social.php
@@ -87,7 +87,7 @@
       } else {
           $subtext = "Subscribe me by mail";
       }
-      $headertext = "<TABLE BORDER=0 WIDTH=100% CELLPADDING=0 CELLSPACING=0><TR><TD>Social Forum - Current Topics<TD ALIGN=RIGHT><FONT SIZE=1><A HREF=\"../mod/discuss/subscribe.php?id=$social->id\">$subtext</A></TD></TR></TABLE>";
+      $headertext = "<TABLE BORDER=0 WIDTH=100% CELLPADDING=0 CELLSPACING=0><TR><TD>Social Forum - Current Topics<TD ALIGN=RIGHT><FONT SIZE=1><A HREF=\"../mod/forum/subscribe.php?id=$social->id\">$subtext</A></TD></TR></TABLE>";
          print_simple_box("$headertext", $align="CENTER", $width="100%", $color="$THEME->cellheading"); ?>
       <IMG ALT="" HEIGHT=7 SRC="../pix/spacer.gif"><BR>
 

diff --git a/course/topics.php b/course/topics.php
index ba4df90bd122b2411c37e3bcb8fcd0e350b4feed..4a5b1741930f32c3e2ff8c0655bf3300f3eb090d 100644 (file)
--- a/course/topics.php
+++ b/course/topics.php
@@ -80,7 +80,7 @@
 
     if (isteacher($course->id)) {
         $adminicon[]="<IMG SRC=\"../pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"Edit\">";
-        if ($USER->editing) {
+        if (isediting($course->id)) {
             $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">Turn editing off</A>";
         } else {
             $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">Turn editing on</A>";
@@ -145,7 +145,7 @@
             $thissection->id = insert_record("course_sections", $thissection);
         }
 
-        if ($USER->editing) {
+        if (isediting($course->id)) {
             $thissection->summary .= "&nbsp;<A HREF=editsection.php?id=$thissection->id><IMG SRC=\"../pix/t/edit.gif\" BORDER=0 ALT=\"Edit summary\"></A></P>";
         }
 
@@ -162,7 +162,7 @@
                 echo "<IMG SRC=\"../mod/$mod->modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">";
                 echo " <A TITLE=\"$mod->modfullname\"";
                 echo "   HREF=\"../mod/$mod->modname/view.php?id=$mod->id\">$instancename</A>";
-                if ($USER->editing) {
+                if (isediting($course->id)) {
                     echo make_editing_buttons($mod->id);
                 }
                 echo "<BR>\n";
@@ -170,7 +170,7 @@
         }
         echo "</UL></P>\n";
 
-        if ($USER->editing) {
+        if (isediting($course->id)) {
             echo "<DIV ALIGN=right>";
             popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$section&add=", 
                         $modtypes, "section$section", "", "Add...");
@@ -185,7 +185,7 @@
         } else {
             echo "<A HREF=\"view.php?id=$course->id&topic=$section\" TITLE=\"Show only topic $section\"><IMG SRC=../pix/i/one.gif BORDER=0></A><BR><BR>";
         }
-        if ($USER->editing and $course->marker != $section) {
+        if (isediting($course->id) and $course->marker != $section) {
             echo "<A HREF=\"view.php?id=$course->id&marker=$section\" TITLE=\"Mark this topic as the current topic\"><IMG SRC=../pix/i/marker.gif BORDER=0></A><BR><BR>";
         }
         echo "</TD>";