- Patch #542658 by sun: follow-up on move action 'tabs' out of local tasks.

2 files changed, 16 insertions, 5 deletions

diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index e70ab1224..ebdac0610 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -391,11 +391,6 @@ function node_admin_content($form, $form_state) {
   if (isset($form_state['values']['operation']) && $form_state['values']['operation'] == 'delete') {
     return node_multiple_delete_confirm($form, $form_state, array_filter($form_state['values']['nodes']));
   }
-  // Show the 'add new content' link.
-  $form['add_content'] = array(
-    '#access' => _node_add_access(),
-    '#markup' => theme('links', array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
-  );
   $form['filter'] = node_filter_form();
   $form['#submit'][] = 'node_filter_form_submit';
   $form['#theme'] = 'node_filter_form';
diff --git a/modules/node/node.module b/modules/node/node.module
index ffaa3a0f7..71e7512ff 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1953,6 +1953,22 @@ function node_menu() {
 }
 
 /**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function node_menu_local_tasks_alter(&$data, $router_item, $root_path) {
+  // Add action link to 'node/add' on 'admin/content' page.
+  if ($root_path == 'admin/content') {
+    $item = menu_get_item('node/add');
+    if ($item['access']) {
+      $data['actions']['output'][] = array(
+        '#theme' => 'menu_local_action',
+        '#link' => $item,
+      );
+    }
+  }
+}
+
+/**
  * Title callback for a node type.
  */
 function node_type_page_title($type) {