making blogs respect global tags flag

diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
index 612e03c5b74e4f8078e26d01eceec9404359b8b9..09ed5043ac973c35e6b19d8682dccd027a2705ae 100644 (file)
--- a/blocks/blog_tags/block_blog_tags.php
+++ b/blocks/blog_tags/block_blog_tags.php
@@ -42,7 +42,7 @@ class block_blog_tags extends block_base {
 
         global $CFG, $SITE, $COURSE, $USER;
 
-        if (empty($CFG->bloglevel)) {
+        if (empty($CFG->usetags) || empty($CFG->bloglevel)) {
             $this->content->text = '';
             return $this->content;
         }

diff --git a/blog/edit_form.php b/blog/edit_form.php
index 9160ffbb1bb87429049b8af0c7b4d2e8b4432bf3..9510100a9dff237c4eff791b857eda85903d5949 100644 (file)
--- a/blog/edit_form.php
+++ b/blog/edit_form.php
@@ -32,43 +32,46 @@ class blog_edit_form extends moodleform {
         $mform->addElement('select', 'publishstate', get_string('publishto', 'blog'), blog_applicable_publish_states());
         $mform->setHelpButton('publishstate', array('publish_state', get_string('helppublish', 'blog'), 'blog'));
 
-        $mform->addElement('header', 'tagshdr', get_string('tags', 'blog'));
-
-        $mform->createElement('select', 'otags', get_string('otags','blog'));
-
-        $js_escape = array(
-            "\r"    => '\r',
-            "\n"    => '\n',
-            "\t"    => '\t',
-            "'"     => "\\'",
-            '"'     => '\"',
-            '\\'    => '\\\\'
-        );
-
-        $otagsselEl =& $mform->addElement('select', 'otags', get_string('otags', 'blog'), array(), 'size="5"');
-        $otagsselEl->setMultiple(true);
-        $this->otags_select_setup();
-
-        if (has_capability('moodle/blog:manageofficialtags', $sitecontext)){
-            $deleteotagsmsg = strtr(get_string('deleteotagswarn', 'blog'), $js_escape);
-            $mform->registerNoSubmitButton('deleteotags');
-            $mform->addElement('submit', 'deleteotags', get_string('delete'),
-                            array('onclick'=>"return confirm('$deleteotagsmsg');"));
-            $mform->disabledIf('deleteotags', 'otags[]', 'noitemselected');
-            $mform->setAdvanced('deleteotags');
-
-            $mform->registerNoSubmitButton('addotags');
-            $otagsgrp = array();
-            $otagsgrp[] =& $mform->createElement('text', 'otagsadd', get_string('addotags', 'blog'));
-            $otagsgrp[] =& $mform->createElement('submit', 'addotags', get_string('add'));
-            $mform->addGroup($otagsgrp, 'otagsgrp', get_string('addotags','blog'), array(' '), false);
-            $mform->setType('otagsadd', PARAM_NOTAGS);
-            $mform->setAdvanced('otagsgrp');
+        
+
+        if (!empty($CFG->usetags)) {
+            $mform->addElement('header', 'tagshdr', get_string('tags', 'blog'));
+            $mform->createElement('select', 'otags', get_string('otags','blog'));
+
+            $js_escape = array(
+                "\r"    => '\r',
+                "\n"    => '\n',
+                "\t"    => '\t',
+                "'"     => "\\'",
+                '"'     => '\"',
+                '\\'    => '\\\\'
+            );
+
+            $otagsselEl =& $mform->addElement('select', 'otags', get_string('otags', 'blog'), array(), 'size="5"');
+            $otagsselEl->setMultiple(true);
+            $this->otags_select_setup();
+
+            if (has_capability('moodle/blog:manageofficialtags', $sitecontext)){
+                $deleteotagsmsg = strtr(get_string('deleteotagswarn', 'blog'), $js_escape);
+                $mform->registerNoSubmitButton('deleteotags');
+                $mform->addElement('submit', 'deleteotags', get_string('delete'),
+                                array('onclick'=>"return confirm('$deleteotagsmsg');"));
+                $mform->disabledIf('deleteotags', 'otags[]', 'noitemselected');
+                $mform->setAdvanced('deleteotags');
+
+                $mform->registerNoSubmitButton('addotags');
+                $otagsgrp = array();
+                $otagsgrp[] =& $mform->createElement('text', 'otagsadd', get_string('addotags', 'blog'));
+                $otagsgrp[] =& $mform->createElement('submit', 'addotags', get_string('add'));
+                $mform->addGroup($otagsgrp, 'otagsgrp', get_string('addotags','blog'), array(' '), false);
+                $mform->setType('otagsadd', PARAM_NOTAGS);
+                $mform->setAdvanced('otagsgrp');
+            }
+
+            $mform->addElement('textarea', 'ptags', get_string('ptags', 'blog'), array('cols'=>'40', 'rows'=>'5'));
+            $mform->setType('ptagsadd', PARAM_NOTAGS);
         }
-
-        $mform->addElement('textarea', 'ptags', get_string('ptags', 'blog'), array('cols'=>'40', 'rows'=>'5'));
-        $mform->setType('ptagsadd', PARAM_NOTAGS);
-
+        
         $this->add_action_buttons();
 
         $mform->addElement('hidden', 'action');

diff --git a/blog/lib.php b/blog/lib.php
index 42ff8db33a5d6b61307e20d5d88dd7ea7e0c5c6f..6690034bca9e7b04bdb4755abb97c92000d2e52c 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -227,7 +227,7 @@
                                      WHERE t.id = ti.tagid
                                      AND ti.entryid = '.$blogEntry->id)) {
         */
-        if ($blogtags = get_item_tags('blog', $blogEntry->id)) {
+        if (!empty($CFG->usetags) && ($blogtags = get_item_tags('blog', $blogEntry->id))) {
             echo '<div class="tags">';
             if ($blogtags) {
                 print_string('tags');