updated core to 7.37
This commit is contained in:
@@ -9,8 +9,8 @@ required = TRUE
|
||||
configure = admin/structure/types
|
||||
stylesheets[all][] = node.css
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-04-02
|
||||
version = "7.36"
|
||||
; Information added by Drupal.org packaging script on 2015-05-07
|
||||
version = "7.37"
|
||||
project = "drupal"
|
||||
datestamp = "1427943826"
|
||||
datestamp = "1430973154"
|
||||
|
||||
|
@@ -933,6 +933,16 @@ function node_update_7014() {
|
||||
db_add_index('node', 'language', array('language'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable node types that may have been erroneously disabled in Drupal 7.36.
|
||||
*/
|
||||
function node_update_7015() {
|
||||
db_update('node_type')
|
||||
->fields(array('disabled' => 0))
|
||||
->condition('base', 'node_content')
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* @} End of "addtogroup updates-7.x-extra".
|
||||
*/
|
||||
|
@@ -740,9 +740,11 @@ function _node_types_build($rebuild = FALSE) {
|
||||
$type_db = $type_object->type;
|
||||
// Original disabled value.
|
||||
$disabled = $type_object->disabled;
|
||||
// Check for node types either from disabled modules or otherwise not defined
|
||||
// and mark as disabled.
|
||||
if (empty($type_object->custom) && empty($_node_types->types[$type_db])) {
|
||||
// Check for node types from disabled modules and mark their types for removal.
|
||||
// Types defined by the node module in the database (rather than by a separate
|
||||
// module using hook_node_info) have a base value of 'node_content'. The isset()
|
||||
// check prevents errors on old (pre-Drupal 7) databases.
|
||||
if (isset($type_object->base) && $type_object->base != 'node_content' && empty($_node_types->types[$type_db])) {
|
||||
$type_object->disabled = TRUE;
|
||||
}
|
||||
if (isset($_node_types->types[$type_db])) {
|
||||
|
@@ -5,8 +5,8 @@ version = VERSION
|
||||
core = 7.x
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-04-02
|
||||
version = "7.36"
|
||||
; Information added by Drupal.org packaging script on 2015-05-07
|
||||
version = "7.37"
|
||||
project = "drupal"
|
||||
datestamp = "1427943826"
|
||||
datestamp = "1430973154"
|
||||
|
||||
|
@@ -5,8 +5,8 @@ version = VERSION
|
||||
core = 7.x
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-04-02
|
||||
version = "7.36"
|
||||
; Information added by Drupal.org packaging script on 2015-05-07
|
||||
version = "7.37"
|
||||
project = "drupal"
|
||||
datestamp = "1427943826"
|
||||
datestamp = "1430973154"
|
||||
|
||||
|
@@ -5,8 +5,8 @@ version = VERSION
|
||||
core = 7.x
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-04-02
|
||||
version = "7.36"
|
||||
; Information added by Drupal.org packaging script on 2015-05-07
|
||||
version = "7.37"
|
||||
project = "drupal"
|
||||
datestamp = "1427943826"
|
||||
datestamp = "1430973154"
|
||||
|
||||
|
Reference in New Issue
Block a user