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

intellecat · Nov 27, 2011 · 6d6bbb9 · 6d6bbb9
2 parents 54734ae + 4576e45
commit 6d6bbb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 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');

diff --git a/plugins/embedvanilla/local.js b/plugins/embedvanilla/local.js
@@ -16,9 +16,6 @@ $(function() {
       forceRemoteUrl = gdn.definition('ForceRemoteUrl', '') != '',
       webroot = gdn.definition('WebRoot'),
       pathroot = gdn.definition('UrlFormat').replace('/{Path}', '').replace('{Path}', '');
-
-   if (!inIframe)
-      return;
 
    if (inIframe) {
       if ("postMessage" in parent) {
@@ -135,6 +132,7 @@ $(function() {
 
       $(window).unload(function() { remotePostMessage('unload', '*'); });
    }
+   else return; // Ignore the rest if we're not embedded.
 
    var path = gdn.definition('Path', '~');
    if (path != '~') {