Project

General

Profile

Revision db2d93dd

Added by Benjamin Luce over 9 years ago

Update to 7.37

View differences:

drupal7/modules/node/node.module
740 740 
    $type_db = $type_object->type;
741 741 
    // Original disabled value.
742 742 
    $disabled = $type_object->disabled;
743 
    // Check for node types either from disabled modules or otherwise not defined
744 
    // and mark as disabled.
745 
    if (empty($type_object->custom) && empty($_node_types->types[$type_db])) {
743 
    // Check for node types from disabled modules and mark their types for removal.
744 
    // Types defined by the node module in the database (rather than by a separate
745 
    // module using hook_node_info) have a base value of 'node_content'. The isset()
746 
    // check prevents errors on old (pre-Drupal 7) databases.
747 
    if (isset($type_object->base) && $type_object->base != 'node_content' && empty($_node_types->types[$type_db])) {
746 748 
      $type_object->disabled = TRUE;
747 749 
    }
748 750 
    if (isset($_node_types->types[$type_db])) {

Also available in: Unified diff