From: toyomoyo <toyomoyo>
Date: Wed, 15 Mar 2006 02:17:35 +0000 (+0000)
Subject: more cleaning
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e17426ca5f8f63eb0023b2224e0adbbbea1dc143;p=moodle.git

more cleaning
---

diff --git a/blog/class.BlogInfo.php b/blog/class.BlogInfo.php
index 11332a42ba..dbb04b0f50 100755
--- a/blog/class.BlogInfo.php
+++ b/blog/class.BlogInfo.php
@@ -95,12 +95,13 @@ class BlogInfo {
     /**
      * Getter for this blog's title, ->blogtitle
      */
+    /*
     function get_blog_title() {
         if (!isset($this->blogtitle)) {
             return '';
         }
         return $this->blogtitle;
-    }
+    }*/
 
     /**
      *
diff --git a/blog/index.php b/blog/index.php
index df07c1ee33..b69b91b184 100755
--- a/blog/index.php
+++ b/blog/index.php
@@ -17,10 +17,7 @@ require_once($CFG->libdir .'/blocklib.php');
 
 $id = optional_param('id', 0, PARAM_INT);
 $limit = optional_param('limit', 0, PARAM_INT);
-$formstart = optional_param('formstart', 'none', PARAM_ALPHA);
-$m = optional_param('m', 0, PARAM_INT); //month
-$y = optional_param('y', 0, PARAM_INT); //year
-$d = optional_param('d', 0, PARAM_INT); //day
+$start = optional_param('formstart', 0, PARAM_INT);
 
 $userid = optional_param('userid',0,PARAM_INT);
 $groupid = optional_param('groupid',0,PARAM_INT);
@@ -156,24 +153,10 @@ switch ($filtertype) {
 }
 
 //first set the start and end day equal to the day argument passed in from the get vars
-$startday = $d;
-$endday = $d + 1;
-if ( empty($d) && !empty($m) && !empty($y) ) {
-    //if there was no day specified then the entire month is wanted.
-    $startday = 1;
-    $endday = blog_mk_getLastDayofMonth($m, $y);
-}
-
 if ($limit == 'none') {
     $limit = get_user_preferences('blogpagesize',8);
 }
 
-if ($formstart == 'none' || $formstart < 0) {
-    $start = 0;
-} else {
-    $start = $formstart;
-}
-
 $blogFilter =& new BlogFilter($userid, '', $limit, $start,$filtertype, $filterselect, $tagid, $tag);
 //print_object($blogFilter); //debug
 
diff --git a/blog/preferences.php b/blog/preferences.php
index ac469b0fc6..ca458dd188 100755
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -42,10 +42,11 @@
     $pageMeta = '' . "\n";
 
     $strpreferences = get_string('preferences');
+    $strblogs = get_string('blogs', 'blog');
 
-    $navigation = '<a href="'. $bloginfo->get_blog_url() .'">'. $bloginfo->get_blog_title() . '</a> -> '. $strpreferences;
+    $navigation = "<a href='".$CFG->wwwroot."/blog/'>$strblogs</a> -> $strpreferences";
 
-    print_header("$site->shortname: ". $bloginfo->get_blog_title() .": $strpreferences", $bloginfo->get_blog_title(), $navigation, '', $pageMeta, true, '', '');
+    print_header("$site->shortname: $strblogs : $strpreferences", $strblogs, $navigation, '', $pageMeta, true, '', '');
 
     print_heading($strpreferences);