From: dhawes <dhawes>
Date: Fri, 31 Dec 2004 03:38:22 +0000 (+0000)
Subject: bug fixes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9723afd1d099a02a96a8d5726cf49c8ee5fb3798;p=moodle.git

bug fixes
---

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 90f1ea6983..30718ee9de 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -20,6 +20,7 @@ class block_rss_client extends block_base {
     }
     
     function get_content() {
+        require_once($CFG->dirroot .'/rss/templib.php');
         global $CFG, $editing;
 
         if($this->content !== NULL) {
@@ -36,7 +37,6 @@ class block_rss_client extends block_base {
             return $this->content;
         }
 
-        require_once($CFG->dirroot .'/rss/templib.php');
         $output = '';
         $rssid = -1;
         $display_description = false;
diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php
index aa1942f530..07a9e9de73 100644
--- a/blocks/rss_client/block_rss_client_action.php
+++ b/blocks/rss_client/block_rss_client_action.php
@@ -26,9 +26,6 @@
     print_header('Add/Edit RSS Feeds','Add/Edit RSS Feeds','Add/Edit RSS Feeds' );
 
     //check to make sure that the user is allowed to post new feeds
-    if (empty( $CFG->block_rss_client_submitters)) {
-         $CFG->block_rss_client_submitters = 0;
-    }
     $submitters = $CFG->block_rss_client_submitters;
     $isteacher = false;
     if ($courseid != 'none'){
diff --git a/rss/templib.php b/rss/templib.php
index ce6aa98862..b1ad0b3429 100644
--- a/rss/templib.php
+++ b/rss/templib.php
@@ -4,7 +4,7 @@ global $CFG;
 
 //initialize config vars for rss_client block if missing
 if (empty($CFG->block_rss_client_submitters) ) {
-    $CFG->block_rss_client_submitters = 2; //default to admin only
+    $CFG->block_rss_client_submitters = 1; //default to admin only
 }
 if (empty($CFG->block_rss_client_num_entries) ) {
     $CFG->block_rss_client_num_entries = 5; //default to 5 entries per block