- Patch #648410 by Dave Reid: standardize add 'empty' row functionality to all tables.

2 files changed, 4 insertions, 14 deletions

diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 0758c272e..3b21311ae 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -44,14 +44,11 @@ function node_overview_types() {
     }
   }
 
-  if (empty($rows)) {
-    $rows[] = array(array('data' => t('No content types available. <a href="@link">Add content type</a>.', array('@link' => url('admin/structure/types/add'))), 'colspan' => '5', 'class' => array('message')));
-  }
-
   $build['node_table'] = array(
     '#theme' => 'table',
     '#header' => $header,
-    '#rows' => $rows
+    '#rows' => $rows,
+    '#empty' => t('No content types available.'),
   );
 
   return $build;
@@ -130,7 +127,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
     '#title' => t('Description'),
     '#type' => 'textarea',
     '#default_value' => $type->description,
-    '#description' => t('Describe this content type. It will be displayed on the <em>Add new content</em> page.'),    
+    '#description' => t('Describe this content type. It will be displayed on the <em>Add new content</em> page.'),
   );
 
   $form['additional_settings'] = array(
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 53a82d350..dd4202f2a 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -554,18 +554,11 @@ function node_admin_nodes() {
   }
   // Otherwise, use a simple table.
   else {
-    // Display an empty message like in the tableselect.
-    if (empty($options)) {
-      $row = array(
-        'data' => t('No content available.'),
-        'colspan' => count($header),
-      );
-      $options = array($row);
-    }
     $form['nodes'] = array(
       '#theme' => 'table',
       '#header' => $header,
       '#rows' => $options,
+      '#empty' => t('No content available.'),
     );
   }