From 702dc57b54b89643969cce662ba15b5017a3550d Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 20 Apr 2009 11:49:26 +0000 Subject: [PATCH] MDL-18902 fixed whitespace, sorrrry --- mod/forum/backuplib.php | 2 +- mod/forum/db/messages.php | 2 +- mod/forum/db/upgrade.php | 6 +++--- mod/forum/index.php | 6 +++--- mod/forum/lib.php | 2 +- mod/forum/post.php | 4 ++-- mod/forum/subscriber.html | 4 ++-- mod/forum/unsubscribeall.php | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/forum/backuplib.php b/mod/forum/backuplib.php index 89a4ef251f..1b13717a99 100644 --- a/mod/forum/backuplib.php +++ b/mod/forum/backuplib.php @@ -88,7 +88,7 @@ fwrite ($bf,full_tag("COMPLETIONDISCUSSIONS",4,false,$forum->completiondiscussions)); fwrite ($bf,full_tag("COMPLETIONREPLIES",4,false,$forum->completionreplies)); fwrite ($bf,full_tag("COMPLETIONPOSTS",4,false,$forum->completionposts)); - + //if we've selected to backup users info, then execute backup_forum_suscriptions and //backup_forum_discussions if (backup_userdata_selected($preferences,'forum',$forum->id)) { diff --git a/mod/forum/db/messages.php b/mod/forum/db/messages.php index a584d2c9a1..be2b995894 100644 --- a/mod/forum/db/messages.php +++ b/mod/forum/db/messages.php @@ -29,7 +29,7 @@ $messageproviders = array ( /// Ordinary single forum posts - 'posts' => array ( + 'posts' => array ( ), /// Digests diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php index a40069b1dc..7892b8e6a8 100644 --- a/mod/forum/db/upgrade.php +++ b/mod/forum/db/upgrade.php @@ -201,7 +201,7 @@ function xmldb_forum_upgrade($oldversion) { /// forum savepoint reached upgrade_mod_savepoint($result, 2009042001, 'forum'); } - + if ($result && $oldversion < 2009042002) { $trustmark = '#####TRUSTTEXT#####'; $rs = $DB->get_recordset_sql("SELECT * FROM {forum_posts} WHERE message LIKE '$trustmark%'"); @@ -219,8 +219,8 @@ function xmldb_forum_upgrade($oldversion) { /// forum savepoint reached upgrade_mod_savepoint($result, 2009042002, 'forum'); } - - + + return $result; } diff --git a/mod/forum/index.php b/mod/forum/index.php index c137529c07..0ccc967049 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -116,19 +116,19 @@ $learningforums[$forum->id] = $forum; } } - + /// Do course wide subscribe/unsubscribe if (!is_null($subscribe) and !isguestuser() and !isguest()) { foreach ($modinfo->instances['forum'] as $forumid=>$cm) { $forum = $forums[$forumid]; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); $cansub = false; if (has_capability('mod/forum:viewdiscussion', $modcontext)) { $cansub = true; } if ($cansub && $cm->visible == 0 && - !has_capability('mod/forum:managesubscriptions', $modcontext)) + !has_capability('mod/forum:managesubscriptions', $modcontext)) { $cansub = false; } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 1645e5cba0..c76ce61274 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -2672,7 +2672,7 @@ function forum_get_user_discussions($courseid, $userid, $groupid=0) { } /** - * Get the list of potential subscribers to a forum. + * Get the list of potential subscribers to a forum. * * @param object $forumcontext the forum context. * @param integer $groupid the id of a group, or 0 for all groups. diff --git a/mod/forum/post.php b/mod/forum/post.php index 60674e635d..cea697d9aa 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -106,7 +106,7 @@ $post->userid = $USER->id; $post->message = ''; $post->messageformat = FORMAT_HTML; // TODO: better default - $post->messagetrust = 0; + $post->messagetrust = 0; if (isset($groupid)) { $post->groupid = $groupid; @@ -134,7 +134,7 @@ print_error('invalidcoursemodule'); } - // call course_setup to use forced language, MDL-6926 + // call course_setup to use forced language, MDL-6926 course_setup($course->id); $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); diff --git a/mod/forum/subscriber.html b/mod/forum/subscriber.html index 1023dc0185..4fe214e8ca 100644 --- a/mod/forum/subscriber.html +++ b/mod/forum/subscriber.html @@ -17,13 +17,13 @@ onFocus="getElementById('subscriberform').add.disabled=true; getElementById('subscriberform').remove.disabled=false; getElementById('subscriberform').addselect.selectedIndex=-1;"> - id\">".$fullname.", ".$subscriber->email."\n"; } ?> - +
diff --git a/mod/forum/unsubscribeall.php b/mod/forum/unsubscribeall.php index 5cd684551b..4bfbd64c95 100644 --- a/mod/forum/unsubscribeall.php +++ b/mod/forum/unsubscribeall.php @@ -28,7 +28,7 @@ if (data_submitted() and $confirm and confirm_sesskey()) { print_continue($return); print_footer(); die; - + } else { $a = $DB->count_records('forum_subscriptions', array('userid'=>$USER->id)); -- 2.39.5