Fixes vanilla#1213.

Remove tag module from within a discussion.
unlight · Nov 10, 2011 · 56978c2 · 56978c2
1 parent e79afa2
commit 56978c2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/Tagging/class.tagging.plugin.php b/plugins/Tagging/class.tagging.plugin.php
@@ -12,7 +12,7 @@
 $PluginInfo['Tagging'] = array(
    'Name' => 'Tagging',
    'Description' => 'Allow tagging of discussions.',
-   'Version' => '1.3.1',
+   'Version' => '1.3.2',
    'SettingsUrl' => '/dashboard/settings/tagging',
    'SettingsPermission' => 'Garden.Settings.Manage',
    'Author' => "Mark O'Sullivan",
@@ -50,7 +50,7 @@ public function CategoriesController_Render_Before($Sender) {
     * Display the tag module in a discussion.
     */
    public function DiscussionController_Render_Before($Sender) {
-      $this->_AddTagModule($Sender);
+      $Sender->AddCSSFile('plugins/Tagging/design/tag.css');
    }
 
    /**
@@ -400,7 +400,7 @@ public function PostController_BeforeFormButtons_Handler($Sender) {
                ->From('TagDiscussion td')
                ->Join('Tag t', 'td.TagID = t.TagID')
                ->Where('td.DiscussionID', GetValue('DiscussionID', $Discussion))
-               ->Where('t.Type', '')
+               ->Where("coalesce(t.Type, '')", '')
                ->Get()->ResultArray();
 
             $Tags = ConsolidateArrayValuesByKey($Tags, 'Name');