Merge branch '2.0.18' of github.com:vanillaforums/Garden into 2.0.18

vanilla · Nov 14, 2011 · 4576e45 · 4576e45
2 parents e3146b3 + ad15065
commit 4576e45
Showing 1 changed file with 2 additions and 2 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.1',
+   'Version' => '1.1p1',
    'SettingsUrl' => '/dashboard/settings/tagging',
    'SettingsPermission' => 'Garden.Settings.Manage',
    'Author' => "Mark O'Sullivan",
@@ -376,7 +376,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');