';
if (isset($title)) {
$output .= 'attributes) . '>' . $object->name . $object->extra . '';
+ // $variables['attributes_array']['class'][] = 'myclass';
+ $output = '' . $variables['name'] . $variables['extra'] . '';
}
return $output;
}
@@ -1973,11 +1952,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 = ' ';
}
return $output;
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.40
diff -u -p -r1.40 theme.maintenance.inc
--- includes/theme.maintenance.inc 11 Sep 2009 13:56:56 -0000 1.40
+++ includes/theme.maintenance.inc 15 Sep 2009 19:00:44 -0000
@@ -85,7 +85,8 @@ function _theme_load_offline_registry($t
*
* @ingroup themeable
*/
-function theme_task_list($items, $active = NULL) {
+function theme_task_list($variables) {
+ extract($variables, EXTR_SKIP);
$done = isset($items[$active]) || $active == NULL;
$output = '
' . $title . '
'; @@ -1829,8 +1811,8 @@ function theme_item_list($items = array( /** * 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 +1823,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 +1838,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'])) . '
';
}
/**
@@ -1871,51 +1853,48 @@ function theme_more_link($url, $title) {
*/
function template_preprocess_username(&$variables) {
$account = $variables['object'];
- // Create a new empty object to populate with standardized data.
- $variables['object'] = new stdClass;
- // Keep a reference to the original data.
- $variables['object']->account = $account;
- $variables['object']->extra = '';
+
+ $variables['extra'] = '';
if (empty($account->uid)) {
- $variables['object']->uid = 0;
+ $variables['uid'] = 0;
if (theme_get_setting('toggle_comment_user_verification')) {
- $variables['object']->extra = ' (' . t('not verified') . ')';
+ $variables['extra'] = ' (' . t('not verified') . ')';
}
}
else {
- $variables['object']->uid = (int)$account->uid;
+ $variables['uid'] = (int)$account->uid;
}
if (empty($account->name)) {
- $variables['object']->name = variable_get('anonymous', t('Anonymous'));
+ $variables['name'] = variable_get('anonymous', t('Anonymous'));
}
else {
- $variables['object']->name = $account->name;
+ $variables['name'] = $account->name;
}
- $variables['object']->profile_access = user_access('access user profiles');
- $variables['object']->link_attributes = array();
+ $variables['profile_access'] = user_access('access user profiles');
+ $variables['link_attributes'] = array();
// Populate link path and attributes if appropriate.
- if ($variables['object']->uid && $variables['object']->profile_access) {
+ if ($variables['uid'] && $variables['profile_access']) {
// We are linking to a local user.
- $variables['object']->link_attributes = array('title' => t('View user profile.'));
- $variables['object']->link_path = 'user/' . $variables['object']->uid;
+ $variables['link_attributes'] = array('title' => t('View user profile.'));
+ $variables['link_path'] = 'user/' . $variables['uid'];
}
elseif (!empty($account->homepage)) {
- $variables['object']->link_attributes = array('rel' => 'nofollow');
- $variables['object']->link_path = $account->homepage;
- $variables['object']->homepage = $account->homepage;
+ $variables['link_attributes'] = array('rel' => 'nofollow');
+ $variables['link_path'] = $account->homepage;
+ $variables['homepage'] = $account->homepage;
}
// We do not want the l() function to check_plain() a second time.
- $variables['object']->link_options['html'] = TRUE;
+ $variables['link_options']['html'] = TRUE;
// Set a default class.
- $variables['object']->attributes = array('class' => array('username'));
+ $variables['attributes_array'] = array('class' => array('username'));
// Shorten the name when it is too long or it will break many tables.
- if (drupal_strlen($variables['object']->name) > 20) {
- $variables['object']->name = drupal_substr($variables['object']->name, 0, 15) . '...';
+ if (drupal_strlen($variables['name']) > 20) {
+ $variables['name'] = drupal_substr($variables['name'], 0, 15) . '...';
}
// Make sure these are safe for use in the theme function.
- $variables['object']->name = check_plain($variables['object']->name);
- $variables['object']->extra = check_plain($variables['object']->extra);
+ $variables['name'] = check_plain($variables['name']);
+ $variables['extra'] = check_plain($variables['extra']);
}
/**
@@ -1927,8 +1906,8 @@ function template_process_username(&$var
// Finalize the link_options array for passing to the l() function.
// This is done in the process phase so that attributes may be added by
// modules or the theme during the preprocess phase.
- if (isset($variables['object']->link_path)) {
- $variables['object']->link_options['attributes'] = $variables['object']->link_attributes + $variables['object']->attributes;
+ if (isset($variables['link_path'])) {
+ $variables['link_options']['attributes'] = $variables['link_attributes'] + $variables['attributes_array'];
}
}
@@ -1947,18 +1926,18 @@ function template_process_username(&$var
* @see template_preprocess_username()
* @see template_process_username()
*/
-function theme_username($object) {
- if (isset($object->link_path)) {
+function theme_username($variables) {
+ if (isset($variables['link_path'])) {
// We have a link path, so we should generate a link using l().
// Additional classes may be added as array elements like
- // $object->link_options['attributes']['class'][] = 'myclass';
- $output = l($object->name . $object->extra, $object->link_path, $object->link_options);
+ // $variables['link_options']['attributes']['class'][] = 'myclass';
+ $output = l($variables['name'] . $variables['extra'], $variables['link_path'], $variables['link_options']);
}
else {
// Modules may have added important attributes so they must be included
// in the output. Additional classes may be added as array elements like
- // $object->attributes['class'][] = 'myclass';
- $output = '';
- $output .= '';
- $output .= '
';
return $output;
@@ -1991,9 +1970,9 @@ function theme_progress_bar($percent, $m
* @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 .= '' . $percent . '%
';
- $output .= '';
+ $output .= '';
+ $output .= '' . $variables['percent'] . '%
';
+ $output .= '';
$output .= 'Installation tasks
'; $output .= '- ';
@@ -118,11 +119,9 @@ function theme_task_list($items, $active
* @param $content
* The page content to show.
*/
-function theme_install_page($content) {
+function theme_install_page($variables) {
drupal_set_header('Content-Type', 'text/html; charset=utf-8');
- // Assign content.
- $variables['content'] = $content;
// Delay setting the message variable so it can be processed below.
$variables['show_messages'] = FALSE;
// Variable processors invoked manually since this function and theme_update_page()
@@ -174,13 +173,10 @@ function theme_install_page($content) {
* Whether to output status and error messages.
* FALSE can be useful to postpone the messages to a subsequent page.
*/
-function theme_update_page($content, $show_messages = TRUE) {
+function theme_update_page($variables) {
// Set required headers.
drupal_set_header('Content-Type', 'text/html; charset=utf-8');
- // Assign content and show message flag.
- $variables['content'] = $content;
- $variables['show_messages'] = $show_messages;
// Variable processors invoked manually since this function and theme_install_page()
// are exceptions in how it works within the theme system.
template_preprocess($variables, 'update_page');
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.422
diff -u -p -r1.422 aggregator.module
--- modules/aggregator/aggregator.module 29 Aug 2009 05:46:01 -0000 1.422
+++ modules/aggregator/aggregator.module 15 Sep 2009 19:00:44 -0000
@@ -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";
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.32
diff -u -p -r1.32 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc 24 Aug 2009 17:11:42 -0000 1.32
+++ modules/aggregator/aggregator.pages.inc 15 Sep 2009 19:00:44 -0000
@@ -235,7 +235,10 @@ function aggregator_categorize_items_sub
* 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 = NUL
* 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";
Index: modules/book/book.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v
retrieving revision 1.21
diff -u -p -r1.21 book.admin.inc
--- modules/book/book.admin.inc 22 Aug 2009 14:34:18 -0000 1.21
+++ modules/book/book.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -222,7 +222,10 @@ function _book_admin_table_tree($tree, &
* @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');
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.513
diff -u -p -r1.513 book.module
--- modules/book/book.module 10 Sep 2009 12:33:43 -0000 1.513
+++ modules/book/book.module 15 Sep 2009 19:00:44 -0000
@@ -303,7 +303,10 @@ function book_block_save($delta = '', $e
*
* @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']);
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.70
diff -u -p -r1.70 color.module
--- modules/color/color.module 5 Sep 2009 15:05:02 -0000 1.70
+++ modules/color/color.module 15 Sep 2009 19:00:44 -0000
@@ -199,7 +199,10 @@ function color_scheme_form(&$form_state,
*
* @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) . '/';
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.769
diff -u -p -r1.769 comment.module
--- modules/comment/comment.module 11 Sep 2009 13:37:52 -0000 1.769
+++ modules/comment/comment.module 15 Sep 2009 19:00:44 -0000
@@ -142,7 +142,7 @@ function comment_theme() {
'arguments' => array('elements' => NULL),
),
'comment_post_forbidden' => array(
- 'arguments' => array('nid' => NULL),
+ 'arguments' => array('node' => NULL),
),
'comment_wrapper' => array(
'template' => 'comment-wrapper',
@@ -2096,12 +2096,12 @@ function template_preprocess_comment(&$v
$variables['signature'] = $comment->signature;
$variables['title'] = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
$variables['template_files'][] = 'comment-' . $variables['node']->type;
-
+
// Helpful $content variable for templates.
foreach (element_children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
-
+
// Set status to a string representation of comment->status.
if (isset($comment->in_preview)) {
$variables['status'] = 'comment-preview';
@@ -2137,7 +2137,10 @@ function template_preprocess_comment(&$v
* 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) {
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.42
diff -u -p -r1.42 dblog.module
--- modules/dblog/dblog.module 29 Aug 2009 03:36:27 -0000 1.42
+++ modules/dblog/dblog.module 15 Sep 2009 19:00:44 -0000
@@ -173,7 +173,10 @@ function dblog_form_system_logging_setti
*
* @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]);
Index: modules/field/field.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.api.php,v
retrieving revision 1.34
diff -u -p -r1.34 field.api.php
--- modules/field/field.api.php 10 Sep 2009 06:31:38 -0000 1.34
+++ modules/field/field.api.php 15 Sep 2009 19:00:44 -0000
@@ -787,7 +787,8 @@ function hook_field_formatter_info_alter
* - #formatter: The name of the formatter being used.
* - #settings: The array of formatter settings.
*/
-function theme_field_formatter_FORMATTER_SINGLE($element) {
+function theme_field_formatter_FORMATTER_SINGLE($variables) {
+ extract($variables, EXTR_SKIP);
// This relies on a 'safe' element being prepared in hook_field_sanitize().
return $element['#item']['safe'];
}
@@ -809,7 +810,10 @@ function theme_field_formatter_FORMATTER
* - #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'];
Index: modules/field/field.form.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.form.inc,v
retrieving revision 1.24
diff -u -p -r1.24 field.form.inc
--- modules/field/field.form.inc 10 Sep 2009 22:31:58 -0000 1.24
+++ modules/field/field.form.inc 15 Sep 2009 19:00:44 -0000
@@ -221,7 +221,8 @@ function field_multiple_value_form($fiel
* Combine multiple values into a table with drag-n-drop reordering.
* TODO : convert to a template.
*/
-function theme_field_multiple_value_form($element) {
+function theme_field_multiple_value_form($variables) {
+ extract($variables, EXTR_SKIP);
$output = '';
if ($element['#multiple'] > 1 || $element['#multiple'] == FIELD_CARDINALITY_UNLIMITED) {
Index: modules/field/modules/list/list.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/list/list.module,v
retrieving revision 1.14
diff -u -p -r1.14 list.module
--- modules/field/modules/list/list.module 9 Sep 2009 21:21:54 -0000 1.14
+++ modules/field/modules/list/list.module 15 Sep 2009 19:00:44 -0000
@@ -257,7 +257,8 @@ function list_field_formatter_info() {
/**
* Theme function for 'default' list field formatter.
*/
-function theme_field_formatter_list_default($element) {
+function theme_field_formatter_list_default($variables) {
+ $element = $variables['element'];
$field = field_info_field($element['#field_name']);
if (($allowed_values = list_allowed_values($field)) && isset($allowed_values[$element['#item']['value']])) {
return $allowed_values[$element['#item']['value']];
@@ -269,6 +270,7 @@ function theme_field_formatter_list_defa
/**
* Theme function for 'key' list field formatter.
*/
-function theme_field_formatter_list_key($element) {
+function theme_field_formatter_list_key($variables) {
+ $element = $variables['element'];
return $element['#item']['safe'];
}
Index: modules/field/modules/number/number.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/number/number.module,v
retrieving revision 1.18
diff -u -p -r1.18 number.module
--- modules/field/modules/number/number.module 11 Sep 2009 00:06:53 -0000 1.18
+++ modules/field/modules/number/number.module 15 Sep 2009 19:00:44 -0000
@@ -240,14 +240,16 @@ function number_field_formatter_info() {
/**
* Theme function for 'unformatted' number field formatter.
*/
-function theme_field_formatter_number_unformatted($element) {
+function theme_field_formatter_number_unformatted($variables) {
+ $element = $variables['element'];
return $element['#item']['value'];
}
/**
* Proxy theme function for number field formatters.
*/
-function theme_field_formatter_number($element) {
+function theme_field_formatter_number($variables) {
+ $element = $variables['element'];
$field = field_info_field($element['#field_name']);
$instance = field_info_instance($element['#field_name'], $element['#bundle']);
$value = $element['#item']['value'];
@@ -497,6 +499,7 @@ function number_decimal_validate($elemen
* $element['#field_name'] contains the field name
* $element['#delta] is the position of this element in the group
*/
-function theme_number($element) {
+function theme_number($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
Index: modules/field/modules/options/options.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/options/options.module,v
retrieving revision 1.10
diff -u -p -r1.10 options.module
--- modules/field/modules/options/options.module 10 Sep 2009 06:31:38 -0000 1.10
+++ modules/field/modules/options/options.module 15 Sep 2009 19:00:44 -0000
@@ -21,7 +21,7 @@ function options_theme() {
'arguments' => array('element' => NULL),
),
'options_none' => array(
- 'arguments' => array('widget_type' => NULL, 'field_name' => NULL, 'node_type' => NULL),
+ 'arguments' => array('instance' => NULL),
),
);
}
@@ -385,7 +385,8 @@ function options_options($field, $instan
* Theme the label for the empty value for options that are not required.
* The default theme will display N/A for a radio list and blank for a select.
*/
-function theme_options_none($instance) {
+function theme_options_none($variables) {
+ $instance = $variables['instance'];
switch ($instance['widget']['type']) {
case 'options_buttons':
case 'node_reference_buttons':
@@ -411,14 +412,17 @@ function theme_options_none($instance) {
* $element['#field_name'] contains the field name
* $element['#delta] is the position of this element in the group
*/
-function theme_options_select($element) {
+function theme_options_select($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
-function theme_options_onoff($element) {
+function theme_options_onoff($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
-function theme_options_buttons($element) {
+function theme_options_buttons($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
\ No newline at end of file
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.28
diff -u -p -r1.28 text.module
--- modules/field/modules/text/text.module 11 Sep 2009 13:30:49 -0000 1.28
+++ modules/field/modules/text/text.module 15 Sep 2009 19:00:44 -0000
@@ -296,21 +296,24 @@ function text_field_formatter_info() {
/**
* Theme function for 'default' text field formatter.
*/
-function theme_field_formatter_text_default($element) {
+function theme_field_formatter_text_default($variables) {
+ $element = $variables['element'];
return $element['#item']['safe'];
}
/**
* Theme function for 'plain' text field formatter.
*/
-function theme_field_formatter_text_plain($element) {
+function theme_field_formatter_text_plain($variables) {
+ $element = $variables['element'];
return strip_tags($element['#item']['safe']);
}
/**
* Theme function for 'trimmed' text field formatter.
*/
-function theme_field_formatter_text_trimmed($element) {
+function theme_field_formatter_text_trimmed($variables) {
+ $element = $variables['element'];
$field = field_info_field($element['#field_name']);
$instance = field_info_instance($element['#field_name'], $element['#bundle']);
return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL);
@@ -322,7 +325,8 @@ function theme_field_formatter_text_trim
* element of the field or, if the summary is empty, the trimmed
* version of the full element of the field.
*/
-function theme_field_formatter_text_summary_or_trimmed($element) {
+function theme_field_formatter_text_summary_or_trimmed($variables) {
+ $element = $variables['element'];
$field = field_info_field($element['#field_name']);
$instance = field_info_instance($element['#field_name'], $element['#bundle']);
@@ -777,10 +781,12 @@ function text_field_widget_formatted_tex
* $element['#field_name'] contains the field name
* $element['#delta] is the position of this element in the group
*/
-function theme_text_textfield($element) {
+function theme_text_textfield($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
-function theme_text_textarea($element) {
+function theme_text_textarea($variables) {
+ $element = $variables['element'];
return $element['#children'];
}
Index: modules/file/file.field.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.field.inc,v
retrieving revision 1.3
diff -u -p -r1.3 file.field.inc
--- modules/file/file.field.inc 10 Sep 2009 22:31:58 -0000 1.3
+++ modules/file/file.field.inc 15 Sep 2009 19:00:44 -0000
@@ -745,7 +745,10 @@ function file_field_widget_process_multi
/**
* 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($ele
* @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($descrip
/**
* 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) {
Index: modules/file/file.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.module,v
retrieving revision 1.4
diff -u -p -r1.4 file.module
--- modules/file/file.module 10 Sep 2009 06:31:39 -0000 1.4
+++ modules/file/file.module 15 Sep 2009 19:00:44 -0000
@@ -80,7 +80,7 @@ function file_theme() {
'arguments' => array('element' => NULL),
),
'file_upload_help' => array(
- 'arguments' => array('upload_validators' => NULL),
+ 'arguments' => array('description' => NULL, 'upload_validators' => NULL),
),
);
}
@@ -577,7 +577,10 @@ function file_managed_file_save_upload($
/**
* 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($elemen
* @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 '
';
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.44
diff -u -p -r1.44 filter.admin.inc
--- modules/filter/filter.admin.inc 11 Sep 2009 15:39:48 -0000 1.44
+++ modules/filter/filter.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -64,7 +64,10 @@ function filter_admin_overview_submit($f
*
* @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
*
* @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) {
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.289
diff -u -p -r1.289 filter.module
--- modules/filter/filter.module 12 Sep 2009 06:09:45 -0000 1.289
+++ modules/filter/filter.module 15 Sep 2009 19:00:44 -0000
@@ -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) ? '' : '';
return '
' . $name . theme('filter_tips', _filter_tips($format->format, FALSE)) . '
';
}
Index: modules/filter/filter.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.pages.inc,v
retrieving revision 1.7
diff -u -p -r1.7 filter.pages.inc
--- modules/filter/filter.pages.inc 8 Mar 2009 21:25:18 -0000 1.7
+++ modules/filter/filter.pages.inc 15 Sep 2009 19:00:44 -0000
@@ -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;
Index: modules/image/image.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 image.admin.inc
--- modules/image/image.admin.inc 5 Sep 2009 15:05:02 -0000 1.10
+++ modules/image/image.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -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($styl
* 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($dat
* 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']));
}
Index: modules/image/image.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.module,v
retrieving revision 1.16
diff -u -p -r1.16 image.module
--- modules/image/image.module 26 Aug 2009 03:20:39 -0000 1.16
+++ modules/image/image.module 15 Sep 2009 19:00:44 -0000
@@ -128,7 +128,7 @@ function image_theme() {
return array(
'image_style' => array(
'arguments' => array(
- 'style' => NULL,
+ 'style_name' => NULL,
'path' => NULL,
'alt' => '',
'title' => '',
@@ -802,7 +802,10 @@ function image_effect_apply($image, $eff
* 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.
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.258
diff -u -p -r1.258 locale.module
--- modules/locale/locale.module 31 Aug 2009 17:06:09 -0000 1.258
+++ modules/locale/locale.module 15 Sep 2009 19:00:44 -0000
@@ -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]);
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.57
diff -u -p -r1.57 menu.admin.inc
--- modules/menu/menu.admin.inc 5 Sep 2009 15:05:03 -0000 1.57
+++ modules/menu/menu.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -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
*
* @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');
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.93
diff -u -p -r1.93 content_types.inc
--- modules/node/content_types.inc 10 Sep 2009 22:10:10 -0000 1.93
+++ modules/node/content_types.inc 15 Sep 2009 19:00:44 -0000
@@ -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) . '
';
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.65
diff -u -p -r1.65 node.admin.inc
--- modules/node/node.admin.inc 5 Sep 2009 06:53:01 -0000 1.65
+++ modules/node/node.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -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,
*
* @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']);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1122
diff -u -p -r1.1122 node.module
--- modules/node/node.module 11 Sep 2009 04:06:39 -0000 1.1122
+++ modules/node/node.module 15 Sep 2009 19:00:44 -0000
@@ -282,7 +282,10 @@ function node_title_list($result, $title
*
* @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(&$vari
*
* @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 . '\n";
$output .= "
\n";
@@ -379,7 +385,10 @@ function node_preview($node) {
*
* @ingroup themeable
*/
-function theme_node_preview($node) {
+function theme_node_preview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '
';
$preview_trimmed_version = FALSE;
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.312
diff -u -p -r1.312 poll.module
--- modules/poll/poll.module 10 Sep 2009 08:43:46 -0000 1.312
+++ modules/poll/poll.module 15 Sep 2009 19:00:44 -0000
@@ -747,7 +747,10 @@ function poll_view_results($node, $build
*
* @ingroup themeable
*/
-function theme_poll_choices($form) {
+function theme_poll_choices($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_add_tabledrag('poll-choice-table', 'order', 'sibling', 'poll-weight');
$delta = 0;
Index: modules/profile/profile.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v
retrieving revision 1.29
diff -u -p -r1.29 profile.admin.inc
--- modules/profile/profile.admin.inc 22 Aug 2009 14:34:21 -0000 1.29
+++ modules/profile/profile.admin.inc 15 Sep 2009 19:00:44 -0000
@@ -96,7 +96,10 @@ function profile_admin_overview_submit($
* @ingroup themeable
* @see profile_admin_overview()
*/
-function theme_profile_admin_overview($form) {
+function theme_profile_admin_overview($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_add_css(drupal_get_path('module', 'profile') . '/profile.css');
// Add javascript if there's more than one field.
if (isset($form['submit'])) {
Index: modules/search/search.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.pages.inc,v
retrieving revision 1.11
diff -u -p -r1.11 search.pages.inc
--- modules/search/search.pages.inc 25 Aug 2009 10:27:14 -0000 1.11
+++ modules/search/search.pages.inc 15 Sep 2009 19:00:44 -0000
@@ -56,7 +56,10 @@ function search_view($type = 'node') {
* @return
* A string containing the listing output.
*/
-function theme_search_results_listing($title, $content) {
+function theme_search_results_listing($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$output = '';
foreach ($requirements as $requirement) {
@@ -2149,7 +2154,8 @@ function theme_status_report($requiremen
* An associative array containing the structure of the form.
* @ingroup themeable
*/
-function theme_system_modules_fieldset($form) {
+function theme_system_modules_fieldset($variables) {
+ extract($variables, EXTR_SKIP);
// Individual table headers.
$rows = array();
// Iterate through all the modules, which are
@@ -2196,8 +2202,8 @@ function theme_system_modules_fieldset($
* @return
* An HTML string for the message.
*/
-function theme_system_modules_incompatible($message) {
- return '
' . $title . '
' . $content . '
';
return $output;
}
Index: modules/simpletest/simpletest.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v
retrieving revision 1.16
diff -u -p -r1.16 simpletest.pages.inc
--- modules/simpletest/simpletest.pages.inc 11 Sep 2009 01:53:29 -0000 1.16
+++ modules/simpletest/simpletest.pages.inc 15 Sep 2009 19:00:44 -0000
@@ -65,7 +65,10 @@ function simpletest_test_form() {
* @param $table Form array that represent a table.
* @return HTML output.
*/
-function theme_simpletest_test_table($table) {
+function theme_simpletest_test_table($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css');
drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js');
@@ -362,7 +365,10 @@ function simpletest_result_form_submit($
*
* @return HTML output.
*/
-function theme_simpletest_result_summary($form) {
+function theme_simpletest_result_summary($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return '' . _simpletest_format_summary_line($form) . '
';
}
Index: modules/simpletest/tests/common_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common_test.module,v
retrieving revision 1.3
diff -u -p -r1.3 common_test.module
--- modules/simpletest/tests/common_test.module 5 Sep 2009 13:05:30 -0000 1.3
+++ modules/simpletest/tests/common_test.module 15 Sep 2009 19:00:45 -0000
@@ -84,7 +84,10 @@ function common_test_theme() {
/**
* Theme function for testing drupal_render() theming.
*/
-function theme_common_test_foo($foo, $bar) {
+function theme_common_test_foo($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
return $foo . $bar;
}
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.22
diff -u -p -r1.22 field_test.module
--- modules/simpletest/tests/field_test.module 10 Sep 2009 06:31:39 -0000 1.22
+++ modules/simpletest/tests/field_test.module 15 Sep 2009 19:00:45 -0000
@@ -561,7 +561,10 @@ function field_test_theme() {
/**
* Theme function for 'field_test_default' formatter.
*/
-function theme_field_formatter_field_test_default($element) {
+function theme_field_formatter_field_test_default($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$value = $element['#item']['value'];
$settings = $element['#settings'];
@@ -571,7 +574,10 @@ function theme_field_formatter_field_tes
/**
* Theme function for 'field_test_multiple' formatter.
*/
-function theme_field_formatter_field_test_multiple($element) {
+function theme_field_formatter_field_test_multiple($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
$settings = $element['#settings'];
$items = array();
Index: modules/syslog/syslog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v
retrieving revision 1.25
diff -u -p -r1.25 syslog.module
--- modules/syslog/syslog.module 27 Aug 2009 07:18:06 -0000 1.25
+++ modules/syslog/syslog.module 15 Sep 2009 19:00:45 -0000
@@ -93,7 +93,10 @@ function syslog_theme() {
*
* @ingroup themeable
*/
-function theme_syslog_format($entry) {
+function theme_syslog_format($variables) {
+ extract($variables, EXTR_SKIP);
+ // @todo remove extract() if possible and check hook_theme defaults.
+
global $base_url;
$message = $base_url;
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.201
diff -u -p -r1.201 system.admin.inc
--- modules/system/system.admin.inc 11 Sep 2009 04:09:26 -0000 1.201
+++ modules/system/system.admin.inc 15 Sep 2009 19:00:45 -0000
@@ -1928,7 +1928,7 @@ function system_php() {
function system_batch_page() {
require_once DRUPAL_ROOT . '/includes/batch.inc';
$output = _batch_page();
-
+
// Use the same theme that the page that started the batch.
$batch = &batch_get();
$GLOBALS['custom_theme'] = $batch['theme'];
@@ -1954,7 +1954,8 @@ function system_batch_page() {
* include a 'title', a 'description' and a formatted 'content'.
* @ingroup themeable
*/
-function theme_admin_block($block) {
+function theme_admin_block($variables) {
+ extract($variables, EXTR_SKIP);
// Don't display the block if it has no content to display.
if (empty($block['show'])) {
return '';
@@ -1995,7 +1996,8 @@ EOT;
* include a 'title', a 'description' and a formatted 'content'.
* @ingroup themeable
*/
-function theme_admin_block_content($content) {
+function theme_admin_block_content($variables) {
+ extract($variables, EXTR_SKIP);
if (!$content) {
return '';
}
@@ -2028,7 +2030,8 @@ function theme_admin_block_content($cont
* in. This is usually 'left' or 'right'.
* @ingroup themeable
*/
-function theme_admin_page($blocks) {
+function theme_admin_page($variables) {
+ extract($variables, EXTR_SKIP);
$stripe = 0;
$container = array();
@@ -2064,7 +2067,8 @@ function theme_admin_page($blocks) {
* An array of modules to be displayed.
* @ingroup themeable
*/
-function theme_system_admin_by_module($menu_items) {
+function theme_system_admin_by_module($variables) {
+ extract($variables, EXTR_SKIP);
$stripe = 0;
$output = '';
$container = array('left' => '', 'right' => '');
@@ -2112,7 +2116,8 @@ function theme_system_admin_by_module($m
* An array of requirements.
* @ingroup themeable
*/
-function theme_status_report($requirements) {
+function theme_status_report($variables) {
+ extract($variables, EXTR_SKIP);
$i = 0;
$output = '