Index: modr8_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/modr8/modr8_admin.inc,v retrieving revision 1.2.2.11 diff -u -r1.2.2.11 modr8_admin.inc --- modr8_admin.inc 13 Dec 2007 00:58:46 -0000 1.2.2.11 +++ modr8_admin.inc 15 Jan 2008 17:54:36 -0000 @@ -182,6 +182,18 @@ '#type' => 'value', '#value' => node_get_types('name', $node), ); + + // Add taxonomy to moderation. + if (module_exists('taxonomy')) { + $taxonomy_subform = array( + '#node' => $node, + 'type' => array('#value' => $node->type), + ); + taxonomy_form_alter($node->type . '_node_form', $taxonomy_subform); + unset($taxonomy_subform['type']); + $form[$node->nid]['taxonomy'] = $taxonomy_subform; + } + } $form['submit'] = array( '#type' => 'submit', @@ -207,7 +219,7 @@ $note_field = drupal_render($form[$key]['note']); } $row[] = array( - 'data' => drupal_render($form[$key]['ops']) . $note_field, + 'data' => drupal_render($form[$key]['ops']) . drupal_render($form[$key]['taxonomy']) . $note_field, 'style' => 'vertical-align:top;' ); $preview = $form[$key]['preview']['#value']; @@ -245,6 +257,11 @@ } db_query('UPDATE {node} SET moderate = 0 '. $publish .' WHERE nid = %d', $nid); drupal_set_message(t('The %type with title %title has been approved.', array('%title' => $values['title'], '%type' => $values['type']))); + + if (module_exists('taxonomy')) { + taxonomy_node_save($nid, $values['taxonomy']['taxonomy']); + } + cache_clear_all(); modr8_log_action('approve', $nid, $values, $message); break;