From: moodler <moodler>
Date: Tue, 21 Mar 2006 01:35:42 +0000 (+0000)
Subject: Tweaking output and layout
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d7dfcee1792d6353ce8c4ac7b793f436397b7d1b;p=moodle.git

Tweaking output and layout
---

diff --git a/blog/class.BlogFilter.php b/blog/class.BlogFilter.php
index 1d3730b311..81885f44ee 100755
--- a/blog/class.BlogFilter.php
+++ b/blog/class.BlogFilter.php
@@ -178,23 +178,23 @@ class BlogFilter {
      */
     function fetch_entries($limit=true) {
         global $CFG, $USER;
-        
+
+
         if (!isset($USER->id)) {
             $USER->id = 0;    //hack, for guests
         }
-        
-        if ($this->tag) {
-            $tagtablesql = $CFG->prefix.'blog_tag_instance bt, ';
-            $tagquerysql = ' AND bt.entryid = p.id AND bt.tagid = '.$this->tag.' ';
-        } else {
-            $tagtablesql = '';
-            $tagquerysql = '';
-        }
-        
+
         // if we have specified an ID
         if ($this->postid) {
 
             if ($post = get_record('post', 'id', $this->postid)) {
+
+                if ($user = get_record('user', 'id', $post->userid)) {
+                    $post->email = $user->email;
+                    $post->firstname = $user->firstname;
+                    $post->lastname = $user->lastname;
+                }
+
                 $blogEntry = new BlogEntry($post);
                 $blogEntries[] = $blogEntry;
 
@@ -202,6 +202,16 @@ class BlogFilter {
                 return $this->filtered_entries;
             }
         }
+        
+        
+        if ($this->tag) {
+            $tagtablesql = $CFG->prefix.'blog_tag_instance bt, ';
+            $tagquerysql = ' AND bt.entryid = p.id AND bt.tagid = '.$this->tag.' ';
+        } else {
+            $tagtablesql = '';
+            $tagquerysql = '';
+        }
+        
 
         /****************************************
          * depending on the type, there are 4   *
diff --git a/blog/lib.php b/blog/lib.php
index a911324833..fd31104517 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -146,6 +146,7 @@ function blog_user_bloginfo($userid='') {
  */
 function blog_print_html_formatted_entries(&$blogFilter, $filtertype, $filterselect) {
     global $CFG, $USER;
+
     $blogpage = optional_param('blogpage', 0, PARAM_INT);
     $bloglimit = get_user_preferences('blogpagesize',8); // expose as user pref when MyMoodle comes around
 
@@ -294,9 +295,10 @@ function blog_print_entry_content ($template, $entryid, $filtertype='', $filters
         echo '<p />';
         print_string('tags');
         echo ': ';
-        foreach ($blogtags as $blogtag) {
-            echo '<a href="index.php?courseid='.$course->id.'&amp;filtertype='.$filtertype.'&amp;filterselect='.$filterselect.'&amp;tagid='.$blogtag->id.'">'.$blogtag->text.'</a>, ';
+        foreach ($blogtags as $key => $blogtag) {
+            $taglist[] = '<a href="index.php?courseid='.$course->id.'&amp;filtertype='.$filtertype.'&amp;filterselect='.$filterselect.'&amp;tagid='.$blogtag->id.'">'.$blogtag->text.'</a>';
         }
+        echo implode(', ', $taglist);
     }
     
 /// Commands