Commit 70bc6acc authored by yched's avatar yched

#728472 by Darren Oh : Ensure the module's preprocess functions run first

parent bd4fe7c0
......@@ -8,6 +8,7 @@ CCK 6.x-2.x
- #736440 by yched, dhthwy: fix memory leaks on long running migration scripts (e.g. migrate.module)
- #705512 by cha0s, roderick: 'add more' button - fix PHP5.3 compatibility
- #894880 by yched: fix notices in check_plain() when rendering empty 'plain text' values
- #728472 by Darren Oh : Ensure the module's preprocess functions run first
CCK 6.x-2.8
===========
......
......@@ -2357,7 +2357,7 @@ function theme_content_exclude($content, $object, $context) {
* TODO : this should live in theme/theme.inc, but then the preprocessor
* doesn't get called when the theme overrides the template. Bug in theme layer ?
*/
function content_preprocess_content_field(&$variables) {
function template_preprocess_content_field(&$variables) {
$element = $variables['element'];
$field = content_fields($element['#field_name'], $element['#node']->type);
......@@ -2706,4 +2706,4 @@ function content_inactive_instances($type_name = NULL) {
return $inactive[$type_name];
}
return $inactive;
}
\ No newline at end of file
}
......@@ -881,7 +881,7 @@ function theme_fieldgroup_fieldset($element) {
*
* @see fieldgroup-simple.tpl.php
*/
function fieldgroup_preprocess_fieldgroup_simple(&$vars) {
function template_preprocess_fieldgroup_simple(&$vars) {
$element = $vars['element'];
$vars['group_name'] = $element['#group_name'];
......@@ -910,4 +910,4 @@ function fieldgroup_preprocess_node(&$vars) {
// '#chilren' might not be set if the group is empty.
$vars[$group_name .'_rendered'] = isset($node->content[$group_name]['#children']) ? $node->content[$group_name]['#children'] : '';
}
}
\ No newline at end of file
}
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