diff --git a/core/modules/node/node.module b/core/modules/node/node.module index dd5038a..5ea4490 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -905,8 +905,9 @@ function template_preprocess_node(&$variables) { field_attach_preprocess($node, $variables['content'], $variables); // Display post information only on certain node types. - $submitted = config('node.settings.' . $node->type)->get('submitted'); - if (is_null($submitted) || $submitted) { + // Avoid loading the entire node type config entity here. + $submitted = config('node.type.' . $node->type)->get('settings.node.submitted'); + if (!isset($submitted) || $submitted) { $variables['display_submitted'] = TRUE; $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date'])); if (theme_get_setting('toggle_node_user_picture')) { @@ -2528,7 +2529,8 @@ function node_list_permissions($type) { function node_permissions_get_configured_types() { $configured_types = array(); foreach (node_type_get_types() as $name => $type) { - if (config('node.settings.' . $name)->get('permissions') ?: TRUE) { + $node_settings = $type->getNodeSettings('node'); + if (!isset($node_settings['permissions']) || !empty($node_settings['permissions'])) { $configured_types[$name] = $type; } }