diff --git a/entity.module b/entity.module index d4a882c..a8ef936 100644 --- a/entity.module +++ b/entity.module @@ -184,8 +184,15 @@ function entity_ui_entity_page_view($entity) { * Gets the page title for the passed operation. */ function entity_ui_get_page_title($op, $entity_type, $entity = NULL) { - module_load_include('inc', 'entity', 'includes/entity.ui'); - $label = entity_label($entity_type, $entity); + $bundle = NULL; + if (isset($entity)) { + module_load_include('inc', 'entity', 'includes/entity.ui'); + $label = entity_label($entity_type, $entity); + } + else { + $info = entity_get_info($entity_type); + $label = $info['label']; + } switch ($op) { case 'view': return $label; @@ -199,14 +206,14 @@ function entity_ui_get_page_title($op, $entity_type, $entity = NULL) { return t('Delete @label', array('@label' => $label)); case 'export': return t('Export @label', array('@label' => $label)); + case 'add': + if (isset($entity)) { + list (, , $bundle) = entity_extract_ids($entity_type, $entity); + } + return entity_ui_get_action_title($op, $entity_type, $bundle); + case 'import': + return t('Import @label', array('@label' => $label)); } - if (isset($entity)) { - list(, , $bundle) = entity_extract_ids($entity_type, $entity); - } - else { - $bundle = NULL; - } - return entity_ui_get_action_title($op, $entity_type, $bundle); } /**