update to 7.x-2.x-dev 10 nov 2012

Signed-off-by: bachy <git@g-u-i.net>

feedback.module

@@ -119,11 +119,25 @@ function feedback_menu() {
     'access arguments' => array('view feedback messages'),
     'file' => 'feedback.admin.inc',
   );
+  $items['admin/reports/feedback/%feedback/view'] = array(
+    'title' => 'View',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['admin/reports/feedback/%feedback/edit'] = array(
+    'title' => 'Edit',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('feedback_entry_form', 3),
+    'access arguments' => array('view feedback messages'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'feedback.admin.inc',
+  );
   $items['admin/reports/feedback/%feedback/delete'] = array(
     'title' => 'Delete feedback entry',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedback_delete_confirm', 3),
     'access arguments' => array('view feedback messages'),
+    'type' => MENU_CALLBACK,
     'file' => 'feedback.admin.inc',
   );
   $items['admin/config/user-interface/feedback'] = array(
@@ -206,14 +220,9 @@ function feedback_form($form, &$form_state) {
   if (!isset($form_state['inline']['location'])) {
     $form_state['inline']['location'] = $_GET['q'];
   }
-  # changed value by type by hidden to be able to change location value in JS
-  // $form['location'] = array(
-  //   '#type' => 'value',
-  //   '#value' => $form_state['inline']['location'],
-  // );
   $form['location'] = array(
-    '#type' => 'hidden',
-    '#default_value' => $form_state['inline']['location'],
+    '#type' => 'value',
+    '#value' => $form_state['inline']['location'],
   );
 
   $form['help'] = array(
@@ -350,15 +359,12 @@ function feedback_format_message($entry) {
       $message .= '<div class="browserinfo">(' . check_plain($entry->useragent) . ')</div>';
     }
   }
+  $elements['message'] = array('#markup' => $message);
   $uri = entity_uri('feedback', $entry);
   if ($uri['path'] != $_GET['q']) {
     $links['view'] = array('title' => t('view'), 'href' => $uri['path']);
+    $elements['links'] = array('#theme' => 'links__feedback_message', '#links' => $links);
   }
-  else {
-    $links['delete'] = array('title' => t('delete'), 'href' => $uri['path'] . '/delete');
-  }
-  $elements['message'] = array('#markup' => $message);
-  $elements['links'] = array('#theme' => 'links__feedback_message', '#links' => $links);
   return $elements;
 }
 
@@ -534,6 +540,12 @@ function feedback_mollom_form_list() {
   $forms['feedback_form'] = array(
     'title' => t('Feedback form'),
     'entity' => 'feedback',
+    'bundle' => 'feedback',
+    'entity delete multiple callback' => 'feedback_delete_multiple',
+    'delete form' => 'feedback_delete_confirm',
+    'delete form file' => array(
+      'name' => 'feedback.admin',
+    ),
     'report access' => array('view feedback messages'),
   );
   return $forms;
@@ -543,15 +555,15 @@ function feedback_mollom_form_list() {
  * Implements hook_mollom_form_info().
  */
 function feedback_mollom_form_info($form_id) {
-  if ($form_id == 'feedback_form') {
-    return array(
-      'mode' => MOLLOM_MODE_ANALYSIS,
-      'bypass access' => array('administer feedback'),
-      'elements' => array(
-        'message' => t('Message'),
-      ),
-    );
-  }
+  $form_info = array(
+    'mode' => MOLLOM_MODE_ANALYSIS,
+    'bypass access' => array('administer feedback'),
+    'elements' => array(
+      'message' => t('Message'),
+    ),
+  );
+  mollom_form_info_add_fields($form_info, 'feedback', 'feedback');
+  return $form_info;
 }
 
 /**