Permalink
Browse files

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

  • Loading branch information...
2 parents 54734ae + 4576e45 commit 6d6bbb900043466a4799960abd431f7923bb345a @tburry tburry committed Nov 27, 2011
Showing with 3 additions and 5 deletions.
  1. +2 −2 plugins/Tagging/class.tagging.plugin.php
  2. +1 −3 plugins/embedvanilla/local.js
@@ -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');
@@ -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 != '~') {

0 comments on commit 6d6bbb9

Please sign in to comment.