Index: reptag/reptag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag.module,v
retrieving revision 1.39.2.4
diff -u -p -r1.39.2.4 reptag.module
--- reptag/reptag.module	28 Sep 2008 15:19:17 -0000	1.39.2.4
+++ reptag/reptag.module	23 Nov 2008 03:22:23 -0000
@@ -21,6 +21,11 @@ function reptag_theme() {
       'template' => 'reptag-dialog',
       'file' => 'reptag_admin_table.inc',
       'arguments' => array('content' => NULL, 'title' => t('Rep[lacement]Tags Dialog')),
+    ),
+    // Even tags need to declare their themes
+    'reptag_node_embed' => array(
+      'file' => 'tags/node.tags.inc',
+      'arguments' => array('node' => NULL),
     )
   );
 }
Index: reptag/reptag_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag_admin.inc,v
retrieving revision 1.16.2.3
diff -u -p -r1.16.2.3 reptag_admin.inc
--- reptag/reptag_admin.inc	28 Sep 2008 11:19:35 -0000	1.16.2.3
+++ reptag/reptag_admin.inc	23 Nov 2008 03:22:25 -0000
@@ -571,49 +571,49 @@ function _reptag_admin_content_form() {
   }
   
   foreach ($content_types as $type) {
-    $form['content'][$type['type']] = array(
+    $fieldset = array(
       '#type' => 'fieldset',
-      '#title' => ucfirst($type['name']),
+      '#title' => ucfirst($type->name),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#tree' => TRUE
     );
-    $form['content'][$type['type']]['table'] = array(
+    $fieldset['table'] = array(
       '#theme' => 'reptag_table',
       '#header' => array(t('Field Label'), t('Type / Widget'), t('Process')),
-      '#parents' => array('content', $type['type'])
+      '#parents' => array('content', $type->type)
     );
-    $fields = (array)unserialize(variable_get('reptag_type_'. $type['type'] .'_fields', serialize(array('body'))));
+    $fields = (array)unserialize(variable_get('reptag_type_'. $type->type .'_fields', serialize(array('body'))));
     // Title field
-    if ($type['has_title'] && variable_get('reptag_enable_title', 0)) {
-      $form['content'][$type['type']]['table']['title']['label'] = array(
-        '#value' => isset($type['title_label']) ? $type['title_label'] : t('Title')
+    if ($type->has_title && variable_get('reptag_enable_title', 0)) {
+      $fieldset['table']['title']['label'] = array(
+        '#value' => isset($type->title_label) ? $type->title_label : t('Title')
       );
-      $form['content'][$type['type']]['table']['title']['type'] = array('#value' => t('text'));
-      $form['content'][$type['type']]['table']['title']['process'] = array(
+      $fieldset['table']['title']['type'] = array('#value' => t('text'));
+      $fieldset['table']['title']['process'] = array(
         '#type' => 'checkbox',
         '#title' => '',
         '#default_value' => in_array('title', $fields)
       );
     }
     // Body field
-    if ($type['has_body']) {
-      $form['content'][$type['type']]['table']['body']['label'] = array(
-        '#value' => isset($type['body_label']) ? $type['body_label'] : t('Body')
+    if ($type->has_body) {
+      $fieldset['table']['body']['label'] = array(
+        '#value' => isset($type->body_label) ? $type->body_label : t('Body')
       );
-      $form['content'][$type['type']]['table']['body']['type'] = array('#value' => t('text'));
-      $form['content'][$type['type']]['table']['body']['process'] = array(
+      $fieldset['table']['body']['type'] = array('#value' => t('text'));
+      $fieldset['table']['body']['process'] = array(
         '#type' => 'checkbox',
         '#title' => '',
         '#default_value' => in_array('body', $fields)
       );
     }
     // CCK fields
-    if (isset($type['fields'])) {
+    if (isset($type->fields)) {
       // Handle fields in fieldgroups
       if (module_exists('fieldgroup')) {
         $group_prefix = array();
-        $groups = fieldgroup_groups($type['type']);
+        $groups = fieldgroup_groups($type->type);
         foreach ($groups as $group) {
           foreach ($group['fields'] as $field => $field_info) {
             $group_prefix[$field] = $field_info['group_name'];
@@ -624,16 +624,16 @@ function _reptag_admin_content_form() {
         if (isset($group_prefix[$field])) {
           $field = $group_prefix[$field] .'/'. $field;
         }
-        $form['content'][$type['type']]['table'][$field]['label'] = array('#value' => $field_info['widget']['label']);
+        $fieldset['table'][$field]['label'] = array('#value' => $field_info['widget']['label']);
         if ($field_info['type'] == $field_info['widget']['type']) {
-          $form['content'][$type['type']]['table'][$field]['type'] = array('#value' => $field_info['type']);
+          $fieldset['table'][$field]['type'] = array('#value' => $field_info['type']);
         }
         else {
-          $form['content'][$type['type']]['table'][$field]['type'] = array(
+          $fieldset['table'][$field]['type'] = array(
             '#value' => $field_info['type'] .' / '. $field_info['widget']['type']
           );
         }
-        $form['content'][$type['type']]['table'][$field]['process'] = array(
+        $fieldset['table'][$field]['process'] = array(
           '#type' => 'checkbox',
           '#title' => '',
           '#default_value' => ($field_info['type'] != 'text') ? FALSE : in_array($field, $fields),
@@ -641,6 +641,7 @@ function _reptag_admin_content_form() {
         );
       }
     }
+    $form['content'][$type->type] = $fieldset;
   }
   
   return _reptag_admin_form($form, '_reptag_admin_content');
Index: reptag/tags/node.tags.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/tags/node.tags.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 node.tags.inc
--- reptag/tags/node.tags.inc	28 Sep 2008 15:19:17 -0000	1.2.2.1
+++ reptag/tags/node.tags.inc	23 Nov 2008 03:22:25 -0000
@@ -71,7 +71,6 @@ function _reptag_node_embed($nid) {
       $node->body = drupal_render($node->content);
       // Allow modules to modify the fully-built node.
       node_invoke_nodeapi($node, 'alter', FALSE, TRUE);
-
       return theme('reptag_node_embed', $node);
     }
   }