Merged from 1.7.

diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php
index 78c0977b2726ee05f4da00ea24a69844a2be8c83..8c08790e8a2526535cd347e29384fcca32458101 100644 (file)
--- a/lang/en_utf8/forum.php
+++ b/lang/en_utf8/forum.php
@@ -130,6 +130,7 @@ $string['namesocial'] = 'Social forum';
 $string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7
 $string['newforumposts'] = 'New forum posts';
 $string['nodiscussions'] = 'There are no discussion topics yet in this forum';
+$string['nodiscussionsstartedby'] = 'No discussions started by this user';
 $string['noguestpost'] = 'Sorry, guests are not allowed to post.';
 $string['noguestsubscribe'] = 'Sorry, guests are not allowed to subscribe to receive forum postings by email.';
 $string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking options.';

diff --git a/mod/forum/user.php b/mod/forum/user.php
index d33216246fa7af5b54df2f8045412e2580c882a7..a28e33a91593937df45af42d52bf8573e62ddc7c 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -121,7 +121,7 @@
         print_paging_bar($totalcount, $page, $perpage, 
                          "user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&");
     } else {
-        print_heading(get_string('noposts', 'forum'));
+        print_heading(get_string('nodiscussionsstartedby', 'forum'));
     }
     echo '</div>';
     print_footer($course);

diff --git a/user/tabs.php b/user/tabs.php
index bddfa6ad3d1430239c98f0b31d75dbed5e7eb48c..e960bc0eed3b31358f9dcbdb167535f2d4bff81e 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -128,7 +128,7 @@
                 $secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
                                       '&id='.$user->id.'&mode=posts', get_string('posts', 'forum'));
                 $secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
-                                      '&id='.$user->id.'&mode=discussions', get_string('discussions', 'forum'));
+                                      '&id='.$user->id.'&mode=discussions', get_string('discussionsstartedby', 'forum'));
             }
 
         }