diff --git includes/menu.inc includes/menu.inc
index 80d7631..5b0119e 100644
--- includes/menu.inc
+++ includes/menu.inc
@@ -1271,8 +1271,8 @@ function theme_menu_item_link($link) {
*
* @ingroup themeable
*/
-function theme_menu_tree($tree) {
- return '
';
+function theme_menu_tree($variables) {
+ return '';
}
/**
@@ -1299,7 +1299,10 @@ function theme_menu_tree($tree) {
* Extra classes that should be added to the class of the list item.
* Defaults to NULL.
*/
-function theme_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL) {
+function theme_menu_item($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$class = ($menu ? 'expanded' : ($has_children ? 'collapsed' : 'leaf'));
if (!empty($extra_class)) {
$class .= ' ' . $extra_class;
@@ -1315,7 +1318,10 @@ function theme_menu_item($link, $has_children, $menu = '', $in_active_trail = FA
*
* @ingroup themeable
*/
-function theme_menu_local_task($link, $active = FALSE) {
+function theme_menu_local_task($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return '';
if (isset($title)) {
$output .= '
' . $title . ' ';
@@ -1829,8 +1842,8 @@ function theme_item_list($items = array(), $title = NULL, $type = 'ul', $attribu
/**
* Returns code that emits the 'more help'-link.
*/
-function theme_more_help_link($url) {
- return '
' . t('
More help ', array('@link' => check_url($url))) . '
';
+function theme_more_help_link($variables) {
+ return '
' . t('
More help ', array('@link' => check_url($variables['url']))) . '
';
}
/**
@@ -1841,10 +1854,10 @@ function theme_more_help_link($url) {
* @param $title
* A descriptive title of the feed.
*/
-function theme_feed_icon($url, $title) {
- $text = t('Subscribe to @feed-title', array('@feed-title' => $title));
+function theme_feed_icon($variables) {
+ $text = t('Subscribe to @feed-title', array('@feed-title' => $variables['title']));
if ($image = theme('image', 'misc/feed.png', $text)) {
- return '
' . $image . ' ';
+ return '
' . $image . ' ';
}
}
@@ -1856,8 +1869,8 @@ function theme_feed_icon($url, $title) {
* @param $title
* A descriptive verb for the link, like 'Read more'
*/
-function theme_more_link($url, $title) {
- return '
' . t('
more ', array('@link' => check_url($url), '@title' => $title)) . '
';
+function theme_more_link($variables) {
+ return '
' . t('
more ', array('@link' => check_url($variables['url']), '@title' => $variables['title'])) . '
';
}
/**
@@ -1947,7 +1960,8 @@ function template_process_username(&$variables) {
* @see template_preprocess_username()
* @see template_process_username()
*/
-function theme_username($object) {
+function theme_username($variables) {
+ $object = $variables['object'];
if (isset($object->link_path)) {
// We have a link path, so we should generate a link using l().
// Additional classes may be added as array elements like
@@ -1973,11 +1987,11 @@ function theme_username($object) {
* @return
* A themed HTML string representing the progress bar.
*/
-function theme_progress_bar($percent, $message) {
+function theme_progress_bar($variables) {
$output = '
';
- $output .= '
';
- $output .= '
' . $percent . '%
';
- $output .= '
' . $message . '
';
+ $output .= '
';
+ $output .= '
' . $variables['percent'] . '%
';
+ $output .= '
' . $variables['message'] . '
';
$output .= '
';
return $output;
@@ -1991,9 +2005,9 @@ function theme_progress_bar($percent, $message) {
* @return
* A string containing indentations.
*/
-function theme_indentation($size = 1) {
+function theme_indentation($variables) {
$output = '';
- for ($n = 0; $n < $size; $n++) {
+ for ($n = 0; $n < $variables['size']; $n++) {
$output .= '
';
}
return $output;
@@ -2003,7 +2017,10 @@ function theme_indentation($size = 1) {
* @} End of "defgroup themeable".
*/
-function _theme_table_cell($cell, $header = FALSE) {
+function _theme_table_cell($variables) {
+ extract($variables, EXTR_SKIP);
+ // $cell, $header = FALSE
+ // @todo remove extract() if possible and check hook_theme defaults.
$attributes = '';
if (is_array($cell)) {
diff --git modules/aggregator/aggregator.module modules/aggregator/aggregator.module
index d857cd4..828736d 100644
--- modules/aggregator/aggregator.module
+++ modules/aggregator/aggregator.module
@@ -638,7 +638,10 @@ function aggregator_category_load($cid) {
* The item HTML.
* @ingroup themeable
*/
-function theme_aggregator_block_item($item, $feed = 0) {
+function theme_aggregator_block_item($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
// Display the external link to the item.
return '
' . check_plain($item->title) . " \n";
diff --git modules/aggregator/aggregator.pages.inc modules/aggregator/aggregator.pages.inc
index 6a6f870..98d5122 100644
--- modules/aggregator/aggregator.pages.inc
+++ modules/aggregator/aggregator.pages.inc
@@ -235,7 +235,10 @@ function aggregator_categorize_items_submit($form, &$form_state) {
* The output HTML.
* @ingroup themeable
*/
-function theme_aggregator_categorize_items($form) {
+function theme_aggregator_categorize_items($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = drupal_render($form['feed_source']);
$rows = array();
if (!empty($form['items'])) {
@@ -368,7 +371,10 @@ function aggregator_page_rss() {
* A common category, if any, for all the feeds.
* @ingroup themeable
*/
-function theme_aggregator_page_rss($feeds, $category = NULL) {
+function theme_aggregator_page_rss($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_set_header('Content-Type', 'application/rss+xml; charset=utf-8');
$items = '';
@@ -428,7 +434,10 @@ function aggregator_page_opml($cid = NULL) {
* An array of the feeds to theme.
* @ingroup themeable
*/
-function theme_aggregator_page_opml($feeds) {
+function theme_aggregator_page_opml($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_set_header('Content-Type', 'text/xml; charset=utf-8');
$output = "\n";
diff --git modules/book/book.admin.inc modules/book/book.admin.inc
index c324379..e397426 100644
--- modules/book/book.admin.inc
+++ modules/book/book.admin.inc
@@ -222,7 +222,10 @@ function _book_admin_table_tree($tree, &$form) {
* @ingroup themeable
* @see book_admin_table()
*/
-function theme_book_admin_table($form) {
+function theme_book_admin_table($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_add_tabledrag('book-outline', 'match', 'parent', 'book-plid', 'book-plid', 'book-mlid', TRUE, MENU_MAX_DEPTH - 2);
drupal_add_tabledrag('book-outline', 'order', 'sibling', 'book-weight');
diff --git modules/book/book.module modules/book/book.module
index 7ac3a3b..956bfe7 100644
--- modules/book/book.module
+++ modules/book/book.module
@@ -303,7 +303,10 @@ function book_block_save($delta = '', $edit = array()) {
*
* @ingroup themeable
*/
-function theme_book_title_link($link) {
+function theme_book_title_link($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$link['options']['attributes']['class'] = array('book-title');
return l($link['title'], $link['href'], $link['options']);
diff --git modules/color/color.module modules/color/color.module
index 5620e42..9de8475 100644
--- modules/color/color.module
+++ modules/color/color.module
@@ -199,7 +199,10 @@ function color_scheme_form(&$form_state, $theme) {
*
* @ingroup themeable
*/
-function theme_color_scheme_form($form) {
+function theme_color_scheme_form($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$theme = $form['theme']['#value'];
$info = $form['info']['#value'];
$path = drupal_get_path('theme', $theme) . '/';
diff --git modules/comment/comment.module modules/comment/comment.module
index 43279b9..7a8528b 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -2137,7 +2137,10 @@ function template_preprocess_comment(&$variables) {
* The comment node.
* @ingroup themeable
*/
-function theme_comment_post_forbidden($node) {
+function theme_comment_post_forbidden($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
global $user;
if (!$user->uid) {
diff --git modules/dblog/dblog.module modules/dblog/dblog.module
index 3d4449f..ee1809d 100644
--- modules/dblog/dblog.module
+++ modules/dblog/dblog.module
@@ -173,7 +173,10 @@ function dblog_form_system_logging_settings_alter(&$form, $form_state) {
*
* @ingroup themeable
*/
-function theme_dblog_filters($form) {
+function theme_dblog_filters($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
foreach (element_children($form['status']) as $key) {
$output .= drupal_render($form['status'][$key]);
diff --git modules/field/field.api.php modules/field/field.api.php
index 4ec2cc7..62a9d91 100644
--- modules/field/field.api.php
+++ modules/field/field.api.php
@@ -809,7 +809,10 @@ function theme_field_formatter_FORMATTER_SINGLE($element) {
* - #settings: The array of formatter settings.
* - numeric indexes: the field values being displayed.
*/
-function theme_field_formatter_FORMATTER_MULTIPLE($element) {
+function theme_field_formatter_FORMATTER_MULTIPLE($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$items = array();
foreach (element_children($element) as $key) {
$items[$key] = $key .':'. $element[$key]['#item']['value'];
diff --git modules/file/file.field.inc modules/file/file.field.inc
index ca95b06..73a2d5e 100644
--- modules/file/file.field.inc
+++ modules/file/file.field.inc
@@ -745,7 +745,10 @@ function file_field_widget_process_multiple($element, &$form_state, $form) {
/**
* Theme an individual file upload widget.
*/
-function theme_file_widget($element) {
+function theme_file_widget($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
// The "form-managed-file" class is required for proper AJAX functionality.
$output .= '
';
@@ -762,7 +765,10 @@ function theme_file_widget($element) {
/**
* Theme a group of file upload widgets.
*/
-function theme_file_widget_multiple($element) {
+function theme_file_widget_multiple($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$field = field_info_field($element['#field_name']);
// Get our list of widgets in order.
@@ -854,7 +860,10 @@ function theme_file_widget_multiple($element) {
* @return
* A string suitable for a file field description.
*/
-function theme_file_upload_help($description, $upload_validators) {
+function theme_file_upload_help($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$descriptions = array();
if (strlen($description)) {
@@ -889,21 +898,30 @@ function theme_file_upload_help($description, $upload_validators) {
/**
* Theme function for 'default' file field formatter.
*/
-function theme_field_formatter_file_default($element) {
+function theme_field_formatter_file_default($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return theme('file_link', (object) $element['#item']);
}
/**
* Theme function for 'url_plain' file field formatter.
*/
-function theme_field_formatter_file_url_plain($element) {
+function theme_field_formatter_file_url_plain($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return empty($element['#item']['uri']) ? '' : file_create_url($element['#item']['uri']);
}
/**
* Theme function for the 'table' formatter.
*/
-function theme_field_formatter_file_table($element) {
+function theme_field_formatter_file_table($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$header = array(t('Attachment'), t('Size'));
$rows = array();
foreach (element_children($element) as $key) {
diff --git modules/file/file.module modules/file/file.module
index 7a2e263..acac478 100644
--- modules/file/file.module
+++ modules/file/file.module
@@ -577,7 +577,10 @@ function file_managed_file_save_upload($element) {
/**
* Theme a managed file element.
*/
-function theme_file_managed_file($element) {
+function theme_file_managed_file($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
// This wrapper is required to apply JS behaviors and CSS styling.
$output = '';
$output .= '
';
@@ -592,7 +595,10 @@ function theme_file_managed_file($element) {
* @param $file
* A file object to which the link will be created.
*/
-function theme_file_link($file) {
+function theme_file_link($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$url = file_create_url($file->uri);
$icon = theme('file_icon', $file);
@@ -622,7 +628,10 @@ function theme_file_link($file) {
* @param $file
* A file object for which to make an icon.
*/
-function theme_file_icon($file) {
+function theme_file_icon($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$mime = check_plain($file->filemime);
$icon_url = file_icon_url($file);
return '
';
diff --git modules/filter/filter.admin.inc modules/filter/filter.admin.inc
index fe17f9c..16f1655 100644
--- modules/filter/filter.admin.inc
+++ modules/filter/filter.admin.inc
@@ -64,7 +64,10 @@ function filter_admin_overview_submit($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_filter_admin_overview($form) {
+function theme_filter_admin_overview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$rows = array();
foreach (element_children($form) as $id) {
$element = $form[$id];
@@ -359,7 +362,10 @@ function filter_admin_order(&$form_state, $format = NULL) {
*
* @ingroup themeable
*/
-function theme_filter_admin_order($form) {
+function theme_filter_admin_order($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$header = array(t('Name'), t('Weight'));
$rows = array();
foreach (element_children($form['names']) as $id) {
diff --git modules/filter/filter.module modules/filter/filter.module
index dec76c7..57cb92d 100644
--- modules/filter/filter.module
+++ modules/filter/filter.module
@@ -781,7 +781,10 @@ function theme_filter_tips_more_info() {
*
* @ingroup themeable
*/
-function theme_filter_guidelines($format) {
+function theme_filter_guidelines($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$name = isset($format->name) ? '
' . $format->name . ': ' : '';
return '
' . $name . theme('filter_tips', _filter_tips($format->format, FALSE)) . '
';
}
diff --git modules/filter/filter.pages.inc modules/filter/filter.pages.inc
index 5d76af4..1f1f211 100644
--- modules/filter/filter.pages.inc
+++ modules/filter/filter.pages.inc
@@ -48,7 +48,10 @@ function filter_tips_long() {
* @see _filter_tips()
* @ingroup themeable
*/
-function theme_filter_tips($tips, $long = FALSE) {
+function theme_filter_tips($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
$multiple = count($tips) > 1;
diff --git modules/image/image.admin.inc modules/image/image.admin.inc
index 53c8a8b..99bf63b 100644
--- modules/image/image.admin.inc
+++ modules/image/image.admin.inc
@@ -572,7 +572,10 @@ function image_rotate_form($data) {
* @see image_get_styles()
* @ingroup themeable
*/
-function theme_image_style_list($styles) {
+function theme_image_style_list($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$header = array(t('Style name'), array('data' => t('Operations'), 'colspan' => 3));
$rows = array();
foreach ($styles as $style) {
@@ -605,7 +608,10 @@ function theme_image_style_list($styles) {
* An associative array containing the structure of the effects group.
* @ingroup themeable
*/
-function theme_image_style_effects($form) {
+function theme_image_style_effects($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$rows = array();
foreach (element_children($form) as $key) {
@@ -658,7 +664,10 @@ function theme_image_style_effects($form) {
* The image style array being previewed.
* @ingroup themeable
*/
-function theme_image_style_preview($style) {
+function theme_image_style_preview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$sample_image = variable_get('image_style_preview_image', drupal_get_path('module', 'image') . '/sample.png');
$sample_width = 160;
$sample_height = 160;
@@ -730,7 +739,10 @@ function theme_image_style_preview($style) {
* A Form API element containing radio buttons.
* @ingroup themeable
*/
-function theme_image_anchor($element) {
+function theme_image_anchor($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$rows = array();
$row = array();
foreach (element_children($element) as $n => $key) {
@@ -753,7 +765,10 @@ function theme_image_anchor($element) {
* The current configuration for this resize effect.
* @ingroup themeable
*/
-function theme_image_resize_summary($data) {
+function theme_image_resize_summary($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
if ($data['width'] && $data['height']) {
return check_plain($data['width']) . 'x' . check_plain($data['height']);
}
@@ -769,7 +784,10 @@ function theme_image_resize_summary($data) {
* The current configuration for this scale effect.
* @ingroup themeable
*/
-function theme_image_scale_summary($data) {
+function theme_image_scale_summary($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return theme('image_resize_summary', $data) . ' ' . ($data['upscale'] ? '(' . t('upscaling allowed') . ')' : '');
}
@@ -780,7 +798,10 @@ function theme_image_scale_summary($data) {
* The current configuration for this crop effect.
* @ingroup themeable
*/
-function theme_image_crop_summary($data) {
+function theme_image_crop_summary($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return theme('image_resize_summary', $data);
}
@@ -791,6 +812,9 @@ function theme_image_crop_summary($data) {
* The current configuration for this rotate effect.
* @ingroup themeable
*/
-function theme_image_rotate_summary($data) {
+function theme_image_rotate_summary($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return ($data['random']) ? t('random between -@degrees° and @degrees°', array('@degrees' => str_replace('-', '', $data['degrees']))) : t('@degrees°', array('@degrees' => $data['degrees']));
}
diff --git modules/image/image.module modules/image/image.module
index d9d344f..423bf79 100644
--- modules/image/image.module
+++ modules/image/image.module
@@ -802,7 +802,10 @@ function image_effect_apply($image, $effect) {
* A string containing the image tag.
* @ingroup themeable
*/
-function theme_image_style($style_name, $path, $alt = '', $title = '', $attributes = array(), $getsize = TRUE) {
+function theme_image_style($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
// theme_image() can only honor the $getsize parameter with local file paths.
// The derivative image is not created until it has been requested so the file
// may not yet exist, in this case we just fallback to the URL.
diff --git modules/locale/locale.module modules/locale/locale.module
index 1f477ad..fcc7f9a 100644
--- modules/locale/locale.module
+++ modules/locale/locale.module
@@ -673,7 +673,10 @@ function locale_block_view($delta = '') {
*
* @ingroup themeable
*/
-function theme_locale_translation_filters($form) {
+function theme_locale_translation_filters($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
foreach (element_children($form['status']) as $key) {
$output .= drupal_render($form['status'][$key]);
diff --git modules/menu/menu.admin.inc modules/menu/menu.admin.inc
index 70fb40d..bc438a1 100644
--- modules/menu/menu.admin.inc
+++ modules/menu/menu.admin.inc
@@ -27,7 +27,10 @@ function menu_overview_page() {
/**
* Theme the menu title and description for admin page
*/
-function theme_menu_admin_overview($title, $name, $description) {
+function theme_menu_admin_overview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = check_plain($title);
$output .= '
' . filter_xss_admin($description) . '
';
@@ -186,7 +189,10 @@ function menu_overview_form_submit($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_menu_overview_form($form) {
+function theme_menu_overview_form($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_add_tabledrag('menu-overview', 'match', 'parent', 'menu-plid', 'menu-plid', 'menu-mlid', TRUE, MENU_MAX_DEPTH - 1);
drupal_add_tabledrag('menu-overview', 'order', 'sibling', 'menu-weight');
diff --git modules/node/content_types.inc modules/node/content_types.inc
index c5bfc69..1ad62cf 100644
--- modules/node/content_types.inc
+++ modules/node/content_types.inc
@@ -47,7 +47,10 @@ function node_overview_types() {
return $build;
}
-function theme_node_admin_overview($name, $type) {
+function theme_node_admin_overview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = check_plain($name);
$output .= '
(Machine name: ' . check_plain($type->type) . ') ';
$output .= '
' . filter_xss_admin($type->description) . '
';
diff --git modules/node/node.admin.inc modules/node/node.admin.inc
index 8835f14..a1a68ee 100644
--- modules/node/node.admin.inc
+++ modules/node/node.admin.inc
@@ -192,7 +192,10 @@ function node_filter_form() {
*
* @ingroup themeable
*/
-function theme_node_filter_form($form) {
+function theme_node_filter_form($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
$output .= '
';
$output .= drupal_render($form['filters']);
@@ -206,7 +209,10 @@ function theme_node_filter_form($form) {
*
* @ingroup themeable
*/
-function theme_node_filters($form) {
+function theme_node_filters($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
$output .= '
';
if (!empty($form['current'])) {
@@ -514,7 +520,10 @@ function node_admin_nodes_submit($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_node_admin_nodes($form) {
+function theme_node_admin_nodes($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
$output .= drupal_render($form['options']);
diff --git modules/node/node.module modules/node/node.module
index 665f0b1..9c7144c 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -282,7 +282,10 @@ function node_title_list($result, $title = NULL) {
*
* @ingroup themeable
*/
-function theme_node_list($items, $title = NULL) {
+function theme_node_list($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return theme('item_list', $items, $title);
}
@@ -1207,7 +1210,10 @@ function template_preprocess_node(&$variables) {
*
* @ingroup themeable
*/
-function theme_node_log_message($log) {
+function theme_node_log_message($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return '' . t('Log') . ':
' . $log . '
';
}
@@ -1508,7 +1514,10 @@ function node_user_cancel($edit, $account, $method) {
*
* @ingroup themeable
*/
-function theme_node_search_admin($form) {
+function theme_node_search_admin($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = drupal_render($form['info']);
$header = array(t('Factor'), t('Weight'));
diff --git modules/node/node.pages.inc modules/node/node.pages.inc
index d524f2a..3429d2d 100644
--- modules/node/node.pages.inc
+++ modules/node/node.pages.inc
@@ -32,7 +32,10 @@ function node_add_page() {
*
* @ingroup themeable
*/
-function theme_node_add_list($content) {
+function theme_node_add_list($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
if ($content) {
@@ -320,7 +323,10 @@ function node_form_build_preview($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_node_form($form) {
+function theme_node_form($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = "\n