From: moodler <moodler>
Date: Tue, 21 Mar 2006 08:04:15 +0000 (+0000)
Subject: Small patches while I contemplate rewriting all those patches from scratch
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0ad2f602852de008a8e1a8c0b88ab17e607392af;p=moodle.git

Small patches while I contemplate rewriting all those patches from scratch
---

diff --git a/blog/class.BlogEntry.php b/blog/class.BlogEntry.php
index 0e2edb000b..0df5000dd0 100755
--- a/blog/class.BlogEntry.php
+++ b/blog/class.BlogEntry.php
@@ -68,13 +68,9 @@ class BlogEntry {
      */
     function BlogEntry(&$entrydetails) {
         global $db, $CFG;
-//        print_object($entrydetails); //debug
 
         $this->entryId = $entrydetails->id;
 
-//        print "Debug: entryId: $this->entryId"; //debug
-//        print_object($this->entryCategoryIds); //debug
-        
         $this->entryBody = ereg_replace('<tick>', "'", stripslashes_safe($entrydetails->summary));
         
         $strftimedaydatetime = get_string('strftimedaydatetime');
@@ -96,9 +92,14 @@ class BlogEntry {
         } else {
             $this->entryPublishState = 'draft';
         }
-        $this->entryAuthorName = fullname($entrydetails);  // firstname and lastname defined
-        $this->entryAuthorEmail = $entrydetails->email;
-
+        if (isset($entrydetails->email)) {
+            $this->entryAuthorEmail = $entrydetails->email;
+            $this->entryAuthorName = fullname($entrydetails);  // firstname and lastname defined
+        } else {
+            $user = get_record('user', 'id', $entrydetails->userid);
+            $this->entryAuthorEmail = $user->email;
+            $this->entryAuthorName = fullname($user); 
+        }
     }
 
     /**
diff --git a/blog/edit.html b/blog/edit.html
index 65b5153f10..d8c9a7b3e7 100755
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -49,7 +49,7 @@
      ?>
     </td>
 </tr>
-<tr>
+<tr valign="top">
     <td align="right">
         <strong><?php print_string('tags'); echo ':';?></strong>
     </td>
@@ -93,12 +93,10 @@
                     }
                 ?>
                 </select>
+    <?php link_to_popup_window("/blog/tags.php",'popup',get_string('tagmanagement')); ?>
                 </td>
             </tr>
         </table>
-    <?php
-    link_to_popup_window("/blog/tags.php",'popup',get_string('tagmanagement'));
-    ?>
     </td>
 </tr>
 
@@ -131,11 +129,7 @@
     </small></small>              
     </td>
     <td align="left" colspan="2">
-    <?php
-        print_string('entrybodyonlydesc', 'blog');
-        print '<br />'."\n";
-        // usage: print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $value="", $courseid)
-        print_textarea($usehtmleditor, 6, 60, 600, 500, 'body', $post->body, $post->courseid); ?>
+    <?php print_textarea($usehtmleditor, 25, 62, 500, 600, 'body', $post->body, $post->courseid); ?>
     </td>
 </tr>
 <tr valign="top">
diff --git a/blog/tags.php b/blog/tags.php
index 38495ca7f7..ce4157b94a 100755
--- a/blog/tags.php
+++ b/blog/tags.php
@@ -23,7 +23,7 @@ switch ($mode) {
             opener.document.entry[\'otags[]\'].insertBefore(o, null);
             </script>';
         } else {
-            error ('there is already a tag with this name!');
+            notify(get_string('tagalready'));
         }
 
     break;
@@ -45,7 +45,7 @@ switch ($mode) {
             opener.document.entry[\'ptags[]\'].insertBefore(o, null);
             </script>';
         } else {
-            error ('there is already a tag with this name!');
+            notify(get_string('tagalready'));
         }
         //write back to window.opener
     break;