Commit 3a85e378 authored by yched's avatar yched

Prepare for RC6 (as a hotfix for #295537)

Reverted a few commits that I'd prefer to keep in -dev for now
parent c5ce919e
//$Id$
CCK 6.2-dev
CCK 6.2.rc6
===========
- #294726 by profix898 and yched: _content_type_info() does not reset on content type changes.
- #293273 Nodereference: update 'referenceable types' when type name changes.
- #265795 by smk-ka: formatter labels go through t() twice in Views exposed data.
Hotfix release for:
- #295537 fix warnings in update 6004 when site has no actual cck fields.
Those errors were harmless, no need to worry or run update.php again if you had them.
Minor fix:
- #265795 by smk-ka: formatter labels go through t() twice in Views exposed data.
CCK 6.2.rc5
===========
......
......@@ -1221,7 +1221,7 @@ function _content_type_info($reset = FALSE) {
return array();
}
if (!$reset && $cached = cache_get('content_type_info', content_cache_tablename())) {
if ($cached = cache_get('content_type_info', content_cache_tablename())) {
$info = $cached->data;
}
else {
......@@ -1281,7 +1281,7 @@ function _content_type_info($reset = FALSE) {
// Populate actual field instances.
module_load_include('inc', 'content', 'includes/content.crud');
foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
foreach (node_get_types() as $type_name => $data) {
$type = (array) $data;
$type['url_str'] = str_replace('_', '-', $type['type']);
$type['fields'] = array();
......
......@@ -273,29 +273,6 @@ function theme_nodereference_formatter_full_teaser($element) {
return $output;
}
/**
* Implementation of hook_node_types.
*/
function nodereference_node_type($op, $info) {
switch ($op) {
case 'update':
// Reflect type name changes to the 'referenceable types' settings.
if (!empty($info->old_type) && $info->old_type != $info->type) {
// content.module's implementaion of hook_node_type() has already
// refreshed _content_type_info().
$fields = content_fields();
foreach ($fields as $field_name => $field) {
if ($field['type'] == 'nodereference' && isset($field['referenceable_types'][$info->old_type])) {
$field['referenceable_types'][$info->type] = empty($field['referenceable_types'][$info->old_type]) ? 0 : $info->type;
unset($field['referenceable_types'][$info->old_type]);
content_field_instance_update($field);
}
}
}
break;
}
}
/**
* Helper function for formatters.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment