--- old-drupal-fresh-2/sites/all/modules/og_vocab/og_vocab.module	2007-09-17 17:14:53.421875000 +0100
+++ new-drupal-fresh-2/sites/all/modules/og_vocab/og_vocab.module	2007-09-17 17:14:53.500000000 +0100
@@ -170,8 +170,9 @@
       if (isset($form['taxonomy'])) {
         // remove from node form those vocabs that belong to groups other than us (if we even have a group)
         $groupnode = og_get_group_context();
-        $where = "(v.module = 'og_vocab' AND ov.nid != %d)";
-        $sql = "SELECT v.vid, v.tags FROM {vocabulary} v LEFT JOIN {og_vocab} ov ON v.vid = ov.vid WHERE $where";
+        $where = "(ov.nid != %d)";
+        // Use an INNER JOIN here to omit rows with nothing in og_vocab
+        $sql = "SELECT v.vid, v.tags FROM {vocabulary} v INNER JOIN {og_vocab} ov ON v.vid = ov.vid WHERE $where";
         $result = db_query($sql, $groupnode->nid);
         while ($row = db_fetch_object($result)) {
           if ($row->tags) {