Changeset 840

Timestamp:

12/24/09 12:43:47 (9 months ago)

Author:

frans

Message:

stupid me: lost changes from r98 in r839. add tokens for og node type name

Files:

• trunk/sites/all/modules/og/og.module (modified) (3 diffs)

trunk/sites/all/modules/og/og.module

@@ -2906 +2906 @@
     $tokens['node']['ogname']          = t("Title of top group");
     $tokens['node']['ogname-raw']      = t("Unfiltered title of top group. WARNING - raw user input.");
-    $tokens['node']['og-id']        = t("ID of top group");
+    $tokens['node']['og-id']           = t("ID of top group");
+    $tokens['node']['og-type']         = t("Node type of the top group");
+    $tokens['node']['og-type-name']    = t("Node type (user-friendly version) of the top group");
     return $tokens;
   }
@@ -2920 +2922 @@
         $gids = array_filter($object->og_groups);
         foreach ($gids as $gid) {
-          $title = db_result(db_query("SELECT title FROM {node} WHERE nid = %d", $gid));
-          $values['ogname'] = check_plain($title);
-          $values['ogname-raw'] = $title;
+          $query = db_query("SELECT n.title as title, n.type as type, t.name as name FROM {node} n INNER JOIN {node_type} t on n.type = t.type WHERE nid = %d", $gid);
+          $group = db_fetch_object($query);
+          $values['ogname'] = check_plain($group->title);
+          $values['ogname-raw'] = $group->title;
           $values['og-id'] = $gid;
+          $values['og-type'] = $group->type;
+          $values['og-type-name'] = check_plain($group->name);
           break;
         }
@@ -2935 +2940 @@
   $values['ogname-raw'] = '';
   $values['og-id'] = '';
+  $values['og-type-name'] = '';
+  $values['og-type'] = '';
   return $values;
 }