';
if (isset($title)) {
$output .= 'attributes) . '>' . $object->name . $object->extra . '';
+ // $variables['attributes_array']['class'][] = 'myclass';
+ $output = '' . $variables['name'] . $variables['extra'] . '';
}
return $output;
}
@@ -1985,18 +1992,19 @@ function theme_username($object) {
/**
* Return a themed progress bar.
*
- * @param $percent
- * The percentage of the progress.
- * @param $message
- * A string containing information to be displayed.
+ * @param $variables
+ * An associative array containing:
+ * - percent: The percentage of the progress.
+ * - message: A string containing information to be displayed.
+ *
* @return
* A themed HTML string representing the progress bar.
*/
-function theme_progress_bar($percent, $message) {
+function theme_progress_bar($variables) {
$output = ' ';
}
return $output;
@@ -2217,7 +2227,7 @@ function template_preprocess_page(&$vari
$variables['base_path'] = base_path();
$variables['front_page'] = url();
- $variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb());
+ $variables['breadcrumb'] = theme('breadcrumb', array('breadcrumb' => drupal_get_breadcrumb()));
$variables['feed_icons'] = drupal_get_feeds();
$variables['language'] = $GLOBALS['language'];
$variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.41
diff -u -p -r1.41 theme.maintenance.inc
--- includes/theme.maintenance.inc 30 Sep 2009 18:36:01 -0000 1.41
+++ includes/theme.maintenance.inc 8 Oct 2009 16:11:54 -0000
@@ -85,7 +85,10 @@ function _theme_load_offline_registry($t
*
* @ingroup themeable
*/
-function theme_task_list($items, $active = NULL) {
+function theme_task_list($variables) {
+ $items = $variables['items'];
+ $active = $variables['active'];
+
$done = isset($items[$active]) || $active == NULL;
$output = '
' . $title . '
'; @@ -1849,92 +1852,89 @@ 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']))) . '
';
}
/**
* Return code that emits an feed icon.
*
- * @param $url
- * The url of the feed.
- * @param $title
- * A descriptive title of the feed.
- */
-function theme_feed_icon($url, $title) {
- $text = t('Subscribe to @feed-title', array('@feed-title' => $title));
- if ($image = theme('image', 'misc/feed.png', $text)) {
- return '' . $image . '';
+ * @param $variables
+ * An associative array containing:
+ * - url: The url of the feed.
+ * - title: A descriptive title of the feed.
+ */
+function theme_feed_icon($variables) {
+ $text = t('Subscribe to @feed-title', array('@feed-title' => $variables['title']));
+ if ($image = theme('image', array('path' => 'misc/feed.png', 'alt' => $text))) {
+ return '' . $image . '';
}
}
/**
* Returns code that emits the 'more' link used on blocks.
*
- * @param $url
- * The url of the main page
- * @param $title
- * A descriptive verb for the link, like 'Read more'
+ * @param $variables
+ * An associative array containing:
+ * - url: The url of the main page
+ * - 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'])) . '
';
}
/**
* Preprocess variables for theme_username().
*
- * Modules that make any changes to the $variables['object'] properties like
- * 'name' or 'extra' must insure that the final string is safe to include
- * directly in the ouput by using check_plain() or filter_xss().
+ * Modules that make any changes to variables like 'name' or 'extra' must insure
+ * that the final string is safe to include directly in the ouput by using
+ * check_plain() or filter_xss().
*
* @see theme_username().
*/
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 = '';
+ $account = $variables['account'];
+
+ $variables['extra'] = '';
if (empty($account->uid)) {
- $variables['object']->uid = 0;
- if (theme_get_setting('toggle_comment_user_verification')) {
- $variables['object']->extra = ' (' . t('not verified') . ')';
- }
+ $variables['uid'] = 0;
+ if (theme_get_setting('toggle_comment_user_verification')) {
+ $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 name is safe for use in the theme function.
- $variables['object']->name = check_plain($variables['object']->name);
+ $variables['name'] = check_plain($variables['name']);
}
/**
@@ -1946,38 +1946,45 @@ 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'];
}
}
/**
* Format a username.
*
- * @param $object
- * The user object to format, which has been processed to provide safe and
- * standarized elements. The object keys 'name', and 'extra' are safe strings
- * that can be used directly.
+ * @param $variables
+ * An associative array containing:
+ * - account: The user object to format.
+ * - name: The user's name, sanitized.
+ * - extra: Additional text to append to the user's name, sanitized.
+ * - link_path: The path or URL of the user's profile page, home page, or
+ * other desired page to link to for more information about the user.
+ * - link_options: An array of options to pass to the l() function's $options
+ * parameter if linking the user's name to the user's page.
+ * - attributes_array: An array of attributes to pass to the
+ * drupal_attributes() function if not linking to the user's page.
*
* @return
- * A string containing an HTML link to the user's page if the passed object
- * suggests that this is a site user. Otherwise, only the username is returned.
+ * A themed HTML string containing the user's name, potentially linked to the
+ * user's page.
*
* @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;
@@ -2005,14 +2013,16 @@ function theme_progress_bar($percent, $m
/**
* Create a standard indentation div. Used for drag and drop tables.
*
- * @param $size
- * Optional. The number of indentations to create.
+ * @param $variables
+ * An associative array containing:
+ * - size: Optional. The number of indentations to create.
+ *
* @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 .= '- ';
@@ -115,14 +118,13 @@ function theme_task_list($items, $active
*
* Note: this function is not themeable.
*
- * @param $content
- * The page content to show.
+ * @param $variables
+ * An associative array containing:
+ * - content: The page content to show.
*/
-function theme_install_page($content) {
+function theme_install_page($variables) {
drupal_add_http_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()
@@ -136,7 +138,7 @@ function theme_install_page($content) {
if (isset($messages['error'])) {
$title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process');
$variables['messages'] .= '
- ' . l($node->title, "node/$node->nid") . ' - ' . format_plural($node->votes, '1 vote', '@count votes') . ' - ' . ($node->active ? t('open') : t('closed')) . ' '; } $output .= ''; - $output .= theme("pager", NULL); + $output .= theme("pager", array('tags' => NULL)); return $output; } @@ -72,14 +72,14 @@ function poll_votes($node) { $rows = array(); foreach ($queried_votes as $vote) { $rows[] = array( - $vote->name ? theme('username', $vote) : check_plain($vote->hostname), + $vote->name ? theme('username', array('account' => $vote)) : check_plain($vote->hostname), check_plain($vote->chtext), format_date($vote->timestamp), ); } $build['poll_votes_table'] = array( - '#theme' => 'table', - '#header' => $header, + '#theme' => 'table', + '#header' => $header, '#rows' => $rows, '#prefix' => t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), ); Index: modules/profile/profile.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v retrieving revision 1.32 diff -u -p -r1.32 profile.admin.inc --- modules/profile/profile.admin.inc 21 Sep 2009 07:56:08 -0000 1.32 +++ modules/profile/profile.admin.inc 8 Oct 2009 16:11:56 -0000 @@ -95,7 +95,9 @@ function profile_admin_overview_submit($ * @ingroup themeable * @see profile_admin_overview() */ -function theme_profile_admin_overview($form) { +function theme_profile_admin_overview($variables) { + $form = $variables['form']; + drupal_add_css(drupal_get_path('module', 'profile') . '/profile.css'); // Add javascript if there's more than one field. if (isset($form['submit'])) { @@ -156,7 +158,7 @@ function theme_profile_admin_overview($f } $header[] = array('data' => t('Operations'), 'colspan' => 2); - $output = theme('table', $header, $rows, array('id' => 'profile-fields')); + $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'profile-fields'))); $output .= drupal_render_children($form); return $output; Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.276 diff -u -p -r1.276 profile.module --- modules/profile/profile.module 22 Sep 2009 07:50:16 -0000 1.276 +++ modules/profile/profile.module 8 Oct 2009 16:11:56 -0000 @@ -193,7 +193,7 @@ function profile_block_view($delta = '') if (!empty($fields)) { $profile = _profile_update_user_fields($fields, $account); - $output .= theme('profile_block', $account, $profile, TRUE); + $output .= theme('profile_block', array('account' => $account, 'fields' => $profile)); } if (isset($use_fields['user_profile']) && $use_fields['user_profile']) { @@ -525,7 +525,7 @@ function profile_category_access($accoun */ function template_preprocess_profile_block(&$variables) { - $variables['user_picture'] = theme('user_picture', $variables['account']); + $variables['user_picture'] = theme('user_picture', array('account' => $variables['account'])); $variables['profile'] = array(); // Supply filtered version of $fields that have values. foreach ($variables['fields'] as $field) { @@ -549,8 +549,8 @@ function template_preprocess_profile_blo */ function template_preprocess_profile_listing(&$variables) { - $variables['user_picture'] = theme('user_picture', $variables['account']); - $variables['name'] = theme('username', $variables['account']); + $variables['user_picture'] = theme('user_picture', array('account' => $variables['account'])); + $variables['name'] = theme('username', array('account' => $variables['account'])); $variables['profile'] = array(); // Supply filtered version of $fields that have values. foreach ($variables['fields'] as $field) { Index: modules/profile/profile.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v retrieving revision 1.20 diff -u -p -r1.20 profile.pages.inc --- modules/profile/profile.pages.inc 21 Sep 2009 07:56:08 -0000 1.20 +++ modules/profile/profile.pages.inc 8 Oct 2009 16:11:56 -0000 @@ -71,13 +71,13 @@ function profile_browse() { $content = ''; foreach ($users as $account) { $profile = _profile_update_user_fields($fields, $account); - $content .= theme('profile_listing', $account, $profile); + $content .= theme('profile_listing', array('account' => $account, 'fields' => $profile)); } - $output = theme('profile_wrapper', $content); - $output .= theme('pager', NULL); + $output = theme('profile_wrapper', array('content' => $content)); + $output .= theme('pager', array('tags' => NULL)); if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') { - $title = strtr(check_plain($field->page), array('%value' => theme('placeholder', $value))); + $title = strtr(check_plain($field->page), array('%value' => theme('placeholder', array('text' => $value)))); } else { $title = check_plain($field->page); @@ -108,10 +108,10 @@ function profile_browse() { $content = ''; foreach ($users as $account) { $profile = _profile_update_user_fields($fields, $account); - $content .= theme('profile_listing', $account, $profile); + $content .= theme('profile_listing', array('account' => $account, 'fields' => $profile)); } - $output = theme('profile_wrapper', $content); - $output .= theme('pager', NULL); + $output = theme('profile_wrapper', array('content' => $content)); + $output .= theme('pager', array('tags' => NULL)); drupal_set_title(t('User list')); return $output; Index: modules/search/search.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.api.php,v retrieving revision 1.16 diff -u -p -r1.16 search.api.php --- modules/search/search.api.php 18 Sep 2009 00:12:47 -0000 1.16 +++ modules/search/search.api.php 8 Oct 2009 16:11:56 -0000 @@ -192,7 +192,7 @@ function hook_search_execute($keys = NUL 'link' => url('node/' . $item->sid, array('absolute' => TRUE)), 'type' => check_plain(node_type_get_name($node)), 'title' => $node->title, - 'user' => theme('username', $node), + 'user' => theme('username', array('account' => $node)), 'date' => $node->changed, 'node' => $node, 'extra' => $extra, Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.318 diff -u -p -r1.318 search.module --- modules/search/search.module 21 Sep 2009 06:44:14 -0000 1.318 +++ modules/search/search.module 8 Oct 2009 16:11:56 -0000 @@ -965,7 +965,7 @@ function search_data($keys = NULL, $type return module_invoke($type, 'search_page', $results); } else { - return theme('search_results', $results, $type); + return theme('search_results', array('results' => $results, 'type' => $type)); } } } 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 8 Oct 2009 16:11:56 -0000 @@ -49,15 +49,16 @@ function search_view($type = 'node') { /** * Theme the listing of search results * - * @param $title - * The subject of the listing. - * @param $content - * The content of the listing. + * @param $variables + * An associative array containing: + * - title: The subject of the listing. + * - content: The content of the listing. + * * @return * A string containing the listing output. */ -function theme_search_results_listing($title, $content) { - $output = '
' . $title . ':
'; - $variables['messages'] .= theme('status_messages', 'error'); + $variables['messages'] .= theme('status_messages', array('display' => 'error')); $variables['content'] .= '' . st('Please check the error messages and try again.', array('!url' => request_uri())) . '
'; } @@ -144,14 +146,14 @@ function theme_install_page($content) { if (isset($messages['warning'])) { $title = count($messages['warning']) > 1 ? st('The following installation warnings should be carefully reviewed') : st('The following installation warning should be carefully reviewed'); $variables['messages'] .= '' . $title . ':
'; - $variables['messages'] .= theme('status_messages', 'warning'); + $variables['messages'] .= theme('status_messages', array('display' => 'warning')); } // Special handling of status messages if (isset($messages['status'])) { $title = count($messages['status']) > 1 ? st('The following installation warnings should be carefully reviewed, but in most cases may be safely ignored') : st('The following installation warning should be carefully reviewed, but in most cases may be safely ignored'); $variables['messages'] .= '' . $title . ':
'; - $variables['messages'] .= theme('status_messages', 'status'); + $variables['messages'] .= theme('status_messages', array('display' => 'status')); } // This was called as a theme hook (not template), so we need to @@ -168,19 +170,16 @@ function theme_install_page($content) { * * Note: this function is not themeable. * - * @param $content - * The page content to show. - * @param $show_messages - * Whether to output status and error messages. - * FALSE can be useful to postpone the messages to a subsequent page. + * @param $variables + * An associative array containing: + * - content: The page content to show. + * - show_messages: 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_add_http_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'); @@ -192,7 +191,7 @@ function theme_update_page($content, $sh if (isset($messages['warning'])) { $title = count($messages['warning']) > 1 ? 'The following update warnings should be carefully reviewed before continuing' : 'The following update warning should be carefully reviewed before continuing'; $variables['messages'] .= '' . $title . ':
'; - $variables['messages'] .= theme('status_messages', 'warning'); + $variables['messages'] .= theme('status_messages', array('display' => 'warning')); } // This was called as a theme hook (not template), so we need to Index: modules/aggregator/aggregator.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v retrieving revision 1.43 diff -u -p -r1.43 aggregator.admin.inc --- modules/aggregator/aggregator.admin.inc 18 Sep 2009 00:12:45 -0000 1.43 +++ modules/aggregator/aggregator.admin.inc 8 Oct 2009 16:11:55 -0000 @@ -32,7 +32,7 @@ function aggregator_view() { if (empty($rows)) { $rows[] = array(array('data' => t('No feeds available. Add feed.', array('@link' => url('admin/content/aggregator/add/feed'))), 'colspan' => '5', 'class' => array('message'))); } - $output .= theme('table', $header, $rows); + $output .= theme('table', array('header' => $header, 'rows' => $rows)); $result = db_query('SELECT c.cid, c.title, COUNT(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title'); @@ -46,7 +46,7 @@ function aggregator_view() { if (empty($rows)) { $rows[] = array(array('data' => t('No categories available. Add category.', array('@link' => url('admin/config/services/aggregator/add/category'))), 'colspan' => '5', 'class' => array('message'))); } - $output .= theme('table', $header, $rows); + $output .= theme('table', array('header' => $header, 'rows' => $rows)); return $output; } Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.424 diff -u -p -r1.424 aggregator.module --- modules/aggregator/aggregator.module 25 Sep 2009 15:20:12 -0000 1.424 +++ modules/aggregator/aggregator.module 8 Oct 2009 16:11:55 -0000 @@ -390,7 +390,7 @@ function aggregator_block_view($delta = if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) { $block['subject'] = check_plain($feed->title); $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", 0, $feed->block, array(':fid' => $id)); - $read_more = theme('more_link', url('aggregator/sources/' . $feed->fid), t("View this feed's recent news.")); + $read_more = theme('more_link', array('url' => url('aggregator/sources/' . $feed->fid), 'title' => t("View this feed's recent news."))); } break; @@ -398,18 +398,18 @@ function aggregator_block_view($delta = if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) { $block['subject'] = check_plain($category->title); $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = :cid ORDER BY i.timestamp DESC, i.iid DESC', 0, $category->block, array(':cid' => $category->cid)); - $read_more = theme('more_link', url('aggregator/categories/' . $category->cid), t("View this category's recent news.")); + $read_more = theme('more_link', array('url' => url('aggregator/categories/' . $category->cid), 'title' => t("View this category's recent news."))); } break; } $items = array(); foreach ($result as $item) { - $items[] = theme('aggregator_block_item', $item); + $items[] = theme('aggregator_block_item', array('item' => $item)); } // Only display the block if there are items to show. if (count($items) > 0) { - $block['content'] = theme('item_list', $items) . $read_more; + $block['content'] = theme('item_list', array('items' => $items)) . $read_more; } return $block; } @@ -642,19 +642,18 @@ function aggregator_category_load($cid) /** * Format an individual feed item for display in the block. * - * @param $item - * The item to be displayed. - * @param $feed - * Not used. + * @param $variables + * An associative array containing: + * - item: The item to be displayed. + * - feed: Not used. + * * @return * The item HTML. * @ingroup themeable */ -function theme_aggregator_block_item($item, $feed = 0) { - +function theme_aggregator_block_item($variables) { // Display the external link to the item. - return '' . check_plain($item->title) . "\n"; - + return '' . check_plain($variables['item']->title) . "\n"; } /** Index: modules/aggregator/aggregator.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v retrieving revision 1.36 diff -u -p -r1.36 aggregator.pages.inc --- modules/aggregator/aggregator.pages.inc 30 Sep 2009 18:36:02 -0000 1.36 +++ modules/aggregator/aggregator.pages.inc 8 Oct 2009 16:11:55 -0000 @@ -37,7 +37,7 @@ function aggregator_page_source($arg1, $ // $arg1 is $form_state and $arg2 is $feed. Otherwise, $arg1 is $feed. $feed = is_object($arg2) ? $arg2 : $arg1; drupal_set_title($feed->title); - $feed_source = theme('aggregator_feed_source', $feed); + $feed_source = theme('aggregator_feed_source', array('feed' => $feed)); // It is safe to include the fid in the query because it's loaded from the // database by aggregator_feed_load. @@ -128,9 +128,9 @@ function _aggregator_page_list($items, $ // Assemble themed output. $output = $feed_source; foreach ($items as $item) { - $output .= theme('aggregator_item', $item); + $output .= theme('aggregator_item', array('item' => $item)); } - $output = theme('aggregator_wrapper', $output); + $output = theme('aggregator_wrapper', array('content' => $output)); } return $output; @@ -163,7 +163,7 @@ function aggregator_categorize_items($it '#tree' => TRUE, ); foreach ($items as $item) { - $form['items'][$item->iid] = array('#markup' => theme('aggregator_item', $item)); + $form['items'][$item->iid] = array('#markup' => theme('aggregator_item', array('item' => $item))); $form['categories'][$item->iid] = array(); $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = :iid', array(':iid' => $item->iid)); $selected = array(); @@ -229,13 +229,17 @@ function aggregator_categorize_items_sub /** * Theme the page list form for assigning categories. * - * @param $form - * An associative array containing the structure of the form. + * @param $variables + * An associative array containing: + * - form: An associative array containing the structure of the form. + * * @return * The output HTML. * @ingroup themeable */ -function theme_aggregator_categorize_items($form) { +function theme_aggregator_categorize_items($variables) { + $form = $variables['form']; + $output = drupal_render($form['feed_source']); $rows = array(); if (!empty($form['items'])) { @@ -246,11 +250,11 @@ function theme_aggregator_categorize_ite ); } } - $output .= theme('table', array('', t('Categorize')), $rows); + $output .= theme('table', array('header' => array('', t('Categorize')), 'rows' => $rows)); $output .= drupal_render($form['submit']); $output .= drupal_render_children($form); - return theme('aggregator_wrapper', $output); + return theme('aggregator_wrapper', array('content' => $output)); } /** @@ -259,7 +263,7 @@ function theme_aggregator_categorize_ite * @see aggregator-wrapper.tpl.php */ function template_preprocess_aggregator_wrapper(&$variables) { - $variables['pager'] = theme('pager', NULL); + $variables['pager'] = theme('pager', array('tags' => NULL)); } /** @@ -306,15 +310,15 @@ function aggregator_page_sources() { if (variable_get('aggregator_summary_items', 3)) { $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = :fid ORDER BY i.timestamp DESC', 0, variable_get('aggregator_summary_items', 3), array(':fid' => $feed->fid)); foreach ($items as $item) { - $summary_items[] = theme('aggregator_summary_item', $item); + $summary_items[] = theme('aggregator_summary_item', array('item' => $item)); } } $feed->url = url('aggregator/sources/' . $feed->fid); - $output .= theme('aggregator_summary_items', $summary_items, $feed); + $output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $feed)); } - $output .= theme('feed_icon', url('aggregator/opml'), t('OPML feed')); + $output .= theme('feed_icon', array('url' => url('aggregator/opml'), 'title' => t('OPML feed'))); - return theme('aggregator_wrapper', $output); + return theme('aggregator_wrapper', array('content' => $output)); } /** @@ -329,14 +333,14 @@ function aggregator_page_categories() { $summary_items = array(); $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = :cid ORDER BY i.timestamp DESC', 0, variable_get('aggregator_summary_items', 3), array(':cid' => $category->cid)); foreach ($items as $item) { - $summary_items[] = theme('aggregator_summary_item', $item); + $summary_items[] = theme('aggregator_summary_item', array('item' => $item)); } } $category->url = url('aggregator/categories/' . $category->cid); - $output .= theme('aggregator_summary_items', $summary_items, $category); + $output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $category)); } - return theme('aggregator_wrapper', $output); + return theme('aggregator_wrapper', array('content' => $output)); } /** @@ -356,19 +360,23 @@ function aggregator_page_rss() { } $feeds = $result->fetchAll(); - return theme('aggregator_page_rss', $feeds, $category); + return theme('aggregator_page_rss', array('feeds' => $feeds, 'category' => $category)); } /** * Theme the RSS output. * - * @param $feeds - * An array of the feeds to theme. - * @param $category - * A common category, if any, for all the feeds. + * @param $variables + * An associative array containing: + * - feeds: An array of the feeds to theme. + * - category: 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) { + $feeds = $variables['feeds']; + $category = $variables['category']; + drupal_add_http_header('Content-Type', 'application/rss+xml; charset=utf-8'); $items = ''; @@ -418,17 +426,21 @@ function aggregator_page_opml($cid = NUL } $feeds = $result->fetchAll(); - return theme('aggregator_page_opml', $feeds); + return theme('aggregator_page_opml', array('feeds' => $feeds)); } /** * Theme the OPML feed output. * - * @param $feeds - * An array of the feeds to theme. + * @param $variables + * An associative array containing: + * - feeds: An array of the feeds to theme. + * * @ingroup themeable */ -function theme_aggregator_page_opml($feeds) { +function theme_aggregator_page_opml($variables) { + $feeds = $variables['feeds']; + drupal_add_http_header('Content-Type', 'text/xml; charset=utf-8'); $output = "\n"; @@ -454,7 +466,7 @@ function theme_aggregator_page_opml($fee */ function template_preprocess_aggregator_summary_items(&$variables) { $variables['title'] = check_plain($variables['source']->title); - $variables['summary_list'] = theme('item_list', $variables['summary_items']); + $variables['summary_list'] = theme('item_list', array('items' => $variables['summary_items'])); $variables['source_url'] = $variables['source']->url; } @@ -486,7 +498,7 @@ function template_preprocess_aggregator_ function template_preprocess_aggregator_feed_source(&$variables) { $feed = $variables['feed']; - $variables['source_icon'] = theme('feed_icon', $feed->url, t('!title feed', array('!title' => $feed->title))); + $variables['source_icon'] = theme('feed_icon', array('url' => $feed->url, 'title' => t('!title feed', array('!title' => $feed->title)))); $variables['source_image'] = $feed->image; $variables['source_description'] = aggregator_filter_xss($feed->description); $variables['source_url'] = check_url(url($feed->link, array('absolute' => TRUE))); Index: modules/aggregator/aggregator.parser.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.parser.inc,v retrieving revision 1.4 diff -u -p -r1.4 aggregator.parser.inc --- modules/aggregator/aggregator.parser.inc 15 Jul 2009 21:32:43 -0000 1.4 +++ modules/aggregator/aggregator.parser.inc 8 Oct 2009 16:11:55 -0000 @@ -37,7 +37,7 @@ function aggregator_aggregator_parse($fe } if (!empty($image['link']) && !empty($image['url']) && !empty($image['title'])) { - $image = l(theme('image', $image['url'], $image['title']), $image['link'], array('html' => TRUE)); + $image = l(theme('image', array('path' => $image['url'], 'alt' => $image['title'])), $image['link'], array('html' => TRUE)); } else { $image = ''; Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.335 diff -u -p -r1.335 blog.module --- modules/blog/blog.module 29 Aug 2009 05:46:02 -0000 1.335 +++ modules/blog/blog.module 8 Oct 2009 16:11:55 -0000 @@ -177,7 +177,7 @@ function blog_block_view($delta = '') { if ($node_title_list = node_title_list($result)) { $block['content'] = $node_title_list; - $block['content'] .= theme('more_link', url('blog'), t('Read the latest blog entries.')); + $block['content'] .= theme('more_link', array('url' => url('blog'), 'title' => t('Read the latest blog entries.'))); $block['subject'] = t('Recent blog posts'); return $block; } Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.22 diff -u -p -r1.22 blog.pages.inc --- modules/blog/blog.pages.inc 10 Aug 2009 22:39:24 -0000 1.22 +++ modules/blog/blog.pages.inc 8 Oct 2009 16:11:55 -0000 @@ -55,7 +55,7 @@ function blog_page_user($account) { drupal_set_message(t('You have not created any blog entries.')); } else { - drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', $account)))); + drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', array('account' => $account))))); } } drupal_add_feed(url('blog/' . $account->uid . '/feed'), t('RSS - !title', array('!title' => $title))); Index: modules/book/book.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v retrieving revision 1.22 diff -u -p -r1.22 book.admin.inc --- modules/book/book.admin.inc 18 Sep 2009 00:12:45 -0000 1.22 +++ modules/book/book.admin.inc 8 Oct 2009 16:11:55 -0000 @@ -24,7 +24,7 @@ function book_admin_overview() { $rows[] = array(array('data' => t('No books available.'), 'colspan' => 2)); } - return theme('table', $headers, $rows); + return theme('table', array('header' => $headers, 'rows' => $rows)); } /** @@ -221,7 +221,9 @@ function _book_admin_table_tree($tree, & * @ingroup themeable * @see book_admin_table() */ -function theme_book_admin_table($form) { +function theme_book_admin_table($variables) { + $form = $variables['form']; + 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'); @@ -240,7 +242,7 @@ function theme_book_admin_table($form) { $form[$key]['weight']['#attributes']['class'] = array('book-weight'); $data = array( - theme('indentation', $form[$key]['depth']['#value'] - 2) . drupal_render($form[$key]['title']), + theme('indentation', array('size' => $form[$key]['depth']['#value'] - 2)) . drupal_render($form[$key]['title']), drupal_render($form[$key]['weight']), drupal_render($form[$key]['plid']) . drupal_render($form[$key]['mlid']), l(t('view'), $href), @@ -255,6 +257,6 @@ function theme_book_admin_table($form) { $rows[] = $row; } - return theme('table', $header, $rows, array('id' => 'book-outline')); + return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'book-outline'))); } Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.516 diff -u -p -r1.516 book.module --- modules/book/book.module 29 Sep 2009 15:31:14 -0000 1.516 +++ modules/book/book.module 8 Oct 2009 16:11:55 -0000 @@ -264,7 +264,7 @@ function book_block_view($delta = '') { $tree = menu_tree_all_data($node->book['menu_name'], $node->book); // There should only be one element at the top level. $data = array_shift($tree); - $block['subject'] = theme('book_title_link', $data['link']); + $block['subject'] = theme('book_title_link', array('link' => $data['link'])); $block['content'] = ($data['below']) ? menu_tree_output($data['below']) : ''; } } @@ -305,7 +305,9 @@ function book_block_save($delta = '', $e * * @ingroup themeable */ -function theme_book_title_link($link) { +function theme_book_title_link($variables) { + $link = $variables['link']; + $link['options']['attributes']['class'] = array('book-title'); return l($link['title'], $link['href'], $link['options']); @@ -737,7 +739,7 @@ function book_node_view($node, $build_mo if ($build_mode == 'full') { if (!empty($node->book['bid']) && empty($node->in_preview)) { $node->content['book_navigation'] = array( - '#markup' => theme('book_navigation', $node->book), + '#markup' => theme('book_navigation', array('book_link' => $node->book)), '#weight' => 100, ); } @@ -1087,7 +1089,7 @@ function book_node_export($node, $childr node_build_content($node, 'print'); $node->rendered = drupal_render($node->content); - return theme('book_node_export_html', $node, $children); + return theme('book_node_export_html', array('node' => $node, 'children' => $children)); } /** Index: modules/book/book.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v retrieving revision 1.16 diff -u -p -r1.16 book.pages.inc --- modules/book/book.pages.inc 18 Sep 2009 00:12:45 -0000 1.16 +++ modules/book/book.pages.inc 8 Oct 2009 16:11:55 -0000 @@ -15,7 +15,7 @@ function book_render() { $book_list[] = l($book['title'], $book['href'], $book['options']); } - return theme('item_list', $book_list); + return theme('item_list', array('items' => $book_list)); } /** @@ -79,7 +79,7 @@ function book_export_html($nid) { $contents = book_export_traverse($tree, 'book_node_export'); } - return theme('book_export_html', $node->title, $contents, $node->book['depth']); + return theme('book_export_html', array('title' => $node->title, 'contents' => $contents, 'depth' => $node->book['depth'])); } else { drupal_access_denied(); Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.72 diff -u -p -r1.72 color.module --- modules/color/color.module 18 Sep 2009 00:12:45 -0000 1.72 +++ modules/color/color.module 8 Oct 2009 16:11:55 -0000 @@ -60,7 +60,7 @@ function _color_theme_select_form_alter( foreach (element_children($form) as $theme) { if ($screenshot = variable_get('color_' . $theme . '_screenshot')) { if (isset($form[$theme]['screenshot'])) { - $form[$theme]['screenshot']['#markup'] = theme('image', $screenshot, '', '', array('class' => array('screenshot')), FALSE); + $form[$theme]['screenshot']['#markup'] = theme('image', array('path' => $screenshot, 'alt' => '', 'title' => '', 'attributes' => array('class' => array('screenshot')), 'getsize' => FALSE)); } } } @@ -207,7 +207,9 @@ function color_scheme_form($form, &$form * * @ingroup themeable */ -function theme_color_scheme_form($form) { +function theme_color_scheme_form($variables) { + $form = $variables['form']; + $theme = $form['theme']['#value']; $info = $form['info']['#value']; $path = drupal_get_path('theme', $theme) . '/'; Index: modules/comment/comment.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v retrieving revision 1.32 diff -u -p -r1.32 comment.admin.inc --- modules/comment/comment.admin.inc 18 Sep 2009 00:12:45 -0000 1.32 +++ modules/comment/comment.admin.inc 8 Oct 2009 16:11:55 -0000 @@ -87,7 +87,7 @@ function comment_admin_overview($form, & foreach ($result as $comment) { $options[$comment->cid] = array( 'subject' => l($comment->subject, 'comment/' . $comment->cid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid)), - 'author' => theme('username', $comment), + 'author' => theme('username', array('account' => $comment)), 'posted_in' => l($comment->node_title, 'node/' . $comment->nid), 'time' => format_date($comment->timestamp, 'short'), 'operations' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination)), Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.775 diff -u -p -r1.775 comment.module --- modules/comment/comment.module 29 Sep 2009 15:31:14 -0000 1.775 +++ modules/comment/comment.module 8 Oct 2009 16:11:55 -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', @@ -466,7 +466,7 @@ function theme_comment_block() { } if ($items) { - return theme('item_list', $items); + return theme('item_list', array('items' => $items)); } } @@ -522,7 +522,7 @@ function comment_node_view($node, $build ); } else { - $links['comment_forbidden']['title'] = theme('comment_post_forbidden', $node); + $links['comment_forbidden']['title'] = theme('comment_post_forbidden', array('node' => $node)); } } } @@ -547,7 +547,7 @@ function comment_node_view($node, $build } } else { - $links['comment_forbidden']['title'] = theme('comment_post_forbidden', $node); + $links['comment_forbidden']['title'] = theme('comment_post_forbidden', array('node' => $node)); } } } @@ -901,7 +901,7 @@ function comment_links($comment, $node) ); } else { - $links['comment_forbidden']['title'] = theme('comment_post_forbidden', $node); + $links['comment_forbidden']['title'] = theme('comment_post_forbidden', array('node' => $node)); $links['comment_forbidden']['html'] = TRUE; } } @@ -1736,7 +1736,7 @@ function comment_form($form, &$form_stat $form['_author'] = array( '#type' => 'item', '#title' => t('Your name'), - '#markup' => theme('username', $user), + '#markup' => theme('username', array('account' => $user)), ); $form['author'] = array( '#type' => 'value', @@ -2093,19 +2093,19 @@ function template_preprocess_comment(&$v $node = $variables['elements']['#node']; $variables['comment'] = $comment; $variables['node'] = $node; - $variables['author'] = theme('username', $comment); + $variables['author'] = theme('username', array('account' => $comment)); $variables['date'] = format_date($comment->timestamp); $variables['new'] = !empty($comment->new) ? t('new') : ''; - $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : ''; + $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : ''; $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,11 +2137,14 @@ function template_preprocess_comment(&$v /** * Theme a "you can't post comments" notice. * - * @param $node - * The comment node. + * @param $variables + * An associative array containing: + * - node: The comment node. + * * @ingroup themeable */ -function theme_comment_post_forbidden($node) { +function theme_comment_post_forbidden($variables) { + $node = $variables['node']; global $user; if (!$user->uid) { Index: modules/contact/contact.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.admin.inc,v retrieving revision 1.16 diff -u -p -r1.16 contact.admin.inc --- modules/contact/contact.admin.inc 26 Sep 2009 00:13:18 -0000 1.16 +++ modules/contact/contact.admin.inc 8 Oct 2009 16:11:55 -0000 @@ -33,7 +33,7 @@ function contact_admin_categories() { $rows[] = array(array('data' => t('No categories available. Add category.', array('@link' => url('admin/structure/contact/add'))), 'colspan' => 5)); } - return theme('table', $header, $rows); + return theme('table', array('header' => $header, 'rows' => $rows)); } /** Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.26 diff -u -p -r1.26 contact.pages.inc --- modules/contact/contact.pages.inc 29 Sep 2009 15:31:14 -0000 1.26 +++ modules/contact/contact.pages.inc 8 Oct 2009 16:11:55 -0000 @@ -177,11 +177,11 @@ function contact_personal_form($form, &$ $form['recipient'] = array('#type' => 'value', '#value' => $recipient); $form['from'] = array('#type' => 'item', '#title' => t('From'), - '#markup' => theme('username', $user) . ' <' . check_plain($user->mail) . '>', + '#markup' => theme('username', array('account' => $user)) . ' <' . check_plain($user->mail) . '>', ); $form['to'] = array('#type' => 'item', '#title' => t('To'), - '#markup' => theme('username', $recipient), + '#markup' => theme('username', array('account' => $recipient)), ); $form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), Index: modules/dblog/dblog.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v retrieving revision 1.30 diff -u -p -r1.30 dblog.admin.inc --- modules/dblog/dblog.admin.inc 18 Sep 2009 00:12:46 -0000 1.30 +++ modules/dblog/dblog.admin.inc 8 Oct 2009 16:11:55 -0000 @@ -16,11 +16,11 @@ function dblog_overview() { WATCHDOG_DEBUG => '', WATCHDOG_INFO => '', WATCHDOG_NOTICE => '', - WATCHDOG_WARNING => theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning')), - WATCHDOG_ERROR => theme('image', 'misc/watchdog-error.png', t('error'), t('error')), - WATCHDOG_CRITICAL => theme('image', 'misc/watchdog-error.png', t('critical'), t('critical')), - WATCHDOG_ALERT => theme('image', 'misc/watchdog-error.png', t('alert'), t('alert')), - WATCHDOG_EMERG => theme('image', 'misc/watchdog-error.png', t('emergency'), t('emergency')), + WATCHDOG_WARNING => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))), + WATCHDOG_ERROR => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error'))), + WATCHDOG_CRITICAL => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('critical'), 'title' => t('critical'))), + WATCHDOG_ALERT => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('alert'), 'title' => t('alert'))), + WATCHDOG_EMERG => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('emergency'), 'title' => t('emergency'))), ); $classes = array( WATCHDOG_DEBUG => 'dblog-debug', @@ -66,7 +66,7 @@ function dblog_overview() { t($dblog->type), format_date($dblog->timestamp, 'short'), l(truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/reports/event/' . $dblog->wid, array('html' => TRUE)), - theme('username', $dblog), + theme('username', array('account' => $dblog)), $dblog->link, ), // Attributes for tr @@ -152,7 +152,7 @@ function dblog_event($id) { ), array( array('data' => t('User'), 'header' => TRUE), - theme('username', $dblog), + theme('username', array('account' => $dblog)), ), array( array('data' => t('Location'), 'header' => TRUE), 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 8 Oct 2009 16:11:55 -0000 @@ -173,8 +173,10 @@ function dblog_form_system_logging_setti * * @ingroup themeable */ -function theme_dblog_filters($form) { +function theme_dblog_filters($variables) { + $form = $variables['form']; $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.37 diff -u -p -r1.37 field.api.php --- modules/field/field.api.php 30 Sep 2009 12:26:36 -0000 1.37 +++ modules/field/field.api.php 8 Oct 2009 16:11:55 -0000 @@ -778,21 +778,22 @@ function hook_field_formatter_info_alter * value (the hook_field_formatter_info() entry uses * 'multiple values' = FIELD_BEHAVIOR_DEFAULT). * - * @param $element - * A render structure sub-array, containing the following keys: - * - #item: The field value being displayed. - * - #delta: The index of the value being displayed within the object(s values - * for the field. - * - #field_name: The name of the field being displayed. - * - #bundle: The bundle of the object being displayed. - * - #object: The object being displayed. - * - #object_type: The type of the object being displayed. - * - #formatter: The name of the formatter being used. - * - #settings: The array of formatter settings. + * @param $variables + * An associative array containing: + * - element: A render structure sub-array, containing the following keys: + * - #item: The field value being displayed. + * - #delta: The index of the value being displayed within the object's + * values for the field. + * - #field_name: The name of the field being displayed. + * - #bundle: The bundle of the object being displayed. + * - #object: The object being displayed. + * - #object_type: The type of the object being displayed. + * - #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) { // This relies on a 'safe' element being prepared in hook_field_sanitize(). - return $element['#item']['safe']; + return $variables['element']['#item']['safe']; } /** @@ -802,17 +803,20 @@ function theme_field_formatter_FORMATTER * (the hook_field_formatter_info() entry uses * 'multiple values' = FIELD_BEHAVIOR_CUSTOM). * - * @param $element - * A render structure sub-array, containing the following keys: - * - #field_name: The name of the field being displayed. - * - #bundle: The bundle of the object being displayed. - * - #object: The object being displayed. - * - #object_type: The type of the object being displayed. - * - #formatter: The name of the formatter being used. - * - #settings: The array of formatter settings. - * - numeric indexes: the field values being displayed. + * @param $variables + * An associative array containing: + * - element: A render structure sub-array, containing the following keys: + * - #field_name: The name of the field being displayed. + * - #bundle: The bundle of the object being displayed. + * - #object: The object being displayed. + * - #object_type: The type of the object being displayed. + * - #formatter: The name of the formatter being used. + * - #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) { + $element = $variables['element']; + $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.26 diff -u -p -r1.26 field.form.inc --- modules/field/field.form.inc 29 Sep 2009 01:08:35 -0000 1.26 +++ modules/field/field.form.inc 8 Oct 2009 16:11:55 -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) { + $element = $variables['element']; $output = ''; if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) { @@ -268,7 +269,7 @@ function theme_field_multiple_value_form } $output = '';
- $output .= theme('table', $header, $rows, array('id' => $table_id, 'class' => array('field-multiple-table')));
+ $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => $table_id, 'class' => array('field-multiple-table'))));
$output .= $element['#description'] ? '
';
Index: modules/field/modules/list/list.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/list/list.module,v
retrieving revision 1.15
diff -u -p -r1.15 list.module
--- modules/field/modules/list/list.module 26 Sep 2009 15:57:38 -0000 1.15
+++ modules/field/modules/list/list.module 8 Oct 2009 16:11:55 -0000
@@ -263,7 +263,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']];
@@ -275,6 +276,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.20
diff -u -p -r1.20 number.module
--- modules/field/modules/number/number.module 27 Sep 2009 11:12:15 -0000 1.20
+++ modules/field/modules/number/number.module 8 Oct 2009 16:11:55 -0000
@@ -242,14 +242,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'];
@@ -493,12 +495,13 @@ function number_decimal_validate($elemen
* FAPI theme for an individual number element.
*
* The textfield is already rendered by the textfield
- * theme and the HTML output lives in $element['#children'].
+ * theme and the HTML output lives in $variables['element']['#children'].
* Override this theme to make custom changes to the output.
*
- * $element['#field_name'] contains the field name
- * $element['#delta] is the position of this element in the group
+ * $variables['element']['#field_name'] contains the field name
+ * $variables['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 8 Oct 2009 16:11:55 -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),
),
);
}
@@ -375,7 +375,7 @@ function options_options($field, $instan
if (!$instance['required']) {
if ((in_array($instance['widget']['type'], array('options_buttons', 'node_reference_buttons', 'user_reference_buttons')) && !$field['cardinality'])
|| (in_array($instance['widget']['type'], array('options_select', 'node_reference_select', 'user_reference_select')))) {
- $options = array('' => theme('options_none', $instance)) + $options;
+ $options = array('' => theme('options_none', array('instance' => $instance))) + $options;
}
}
return $options;
@@ -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':
@@ -405,20 +406,23 @@ function theme_options_none($instance) {
*
* The select, checkboxes or radios are already rendered by the
* select, checkboxes, or radios themes and the HTML output
- * lives in $element['#children']. Override this theme to
+ * lives in $variables['element']['#children']. Override this theme to
* make custom changes to the output.
*
- * $element['#field_name'] contains the field name
- * $element['#delta] is the position of this element in the group
+ * $variables['element']['#field_name'] contains the field name
+ * $variables['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.30
diff -u -p -r1.30 text.module
--- modules/field/modules/text/text.module 26 Sep 2009 15:57:38 -0000 1.30
+++ modules/field/modules/text/text.module 8 Oct 2009 16:11:55 -0000
@@ -299,21 +299,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);
@@ -325,7 +328,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']);
@@ -774,16 +778,18 @@ function text_field_widget_formatted_tex
*
* The textfield or textarea is already rendered by the
* textfield or textarea themes and the html output
- * lives in $element['#children']. Override this theme to
+ * lives in $variables['element']['#children']. Override this theme to
* make custom changes to the output.
*
- * $element['#field_name'] contains the field name
- * $element['#delta] is the position of this element in the group
+ * $variables['element']['#field_name'] contains the field name
+ * $variables['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/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.21
diff -u -p -r1.21 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc 2 Oct 2009 14:39:43 -0000 1.21
+++ modules/field_ui/field_ui.admin.inc 8 Oct 2009 16:11:55 -0000
@@ -34,7 +34,7 @@ function field_ui_fields_list() {
else {
// Sort rows by field name.
ksort($rows);
- $output = theme('table', $header, $rows);
+ $output = theme('table', array('header' => $header, 'rows' => $rows));
}
return $output;
}
@@ -56,7 +56,7 @@ function field_ui_inactive_message($bund
'%widget_module' => $instance['widget']['module'],
));
}
- drupal_set_message(t('Inactive fields are not shown unless their providing modules are enabled. The following fields are not enabled: !list', array('!list' => theme('item_list', $list))), 'error');
+ drupal_set_message(t('Inactive fields are not shown unless their providing modules are enabled. The following fields are not enabled: !list', array('!list' => theme('item_list', array('items' => $list)))), 'error');
}
}
Index: modules/file/file.field.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.field.inc,v
retrieving revision 1.4
diff -u -p -r1.4 file.field.inc
--- modules/file/file.field.inc 26 Sep 2009 15:57:38 -0000 1.4
+++ modules/file/file.field.inc 8 Oct 2009 16:11:55 -0000
@@ -523,7 +523,7 @@ function file_field_widget(&$form, &$for
// If there's only one field, return it as delta 0.
$element['#title'] = $instance['label'];
if (empty($element['#default_value']['fid'])) {
- $element['#description'] = theme('file_upload_help', $instance['description'], $element['#upload_validators']);
+ $element['#description'] = theme('file_upload_help', array('description' => $instance['description'], 'upload_validators' => $element['#upload_validators']));
}
$elements = array($element);
}
@@ -557,7 +557,7 @@ function file_field_widget(&$form, &$for
// field. These are added here so that they may be referenced easily through
// a hook_form_alter().
$elements['#file_upload_title'] = t('Add a new file');
- $elements['#file_upload_description'] = theme('file_upload_help', '', $elements[0]['#upload_validators']);
+ $elements['#file_upload_description'] = theme('file_upload_help', array('description' => '', 'upload_validators' => $elements[0]['#upload_validators']));
}
return $elements;
@@ -746,8 +746,10 @@ function file_field_widget_process_multi
/**
* Theme an individual file upload widget.
*/
-function theme_file_widget($element) {
+function theme_file_widget($variables) {
+ $element = $variables['element'];
$output = '';
+
// The "form-managed-file" class is required for proper AJAX functionality.
$output .= '' . $element['#description'] . '
' : '';
$output .= '' . drupal_render($add_more_button) . '
';
$output .= '';
if ($element['fid']['#value'] != 0) {
@@ -763,7 +765,9 @@ function theme_file_widget($element) {
/**
* Theme a group of file upload widgets.
*/
-function theme_file_widget_multiple($element) {
+function theme_file_widget_multiple($variables) {
+ $element = $variables['element'];
+
$field = field_info_field($element['#field_name']);
// Get our list of widgets in order.
@@ -840,7 +844,7 @@ function theme_file_widget_multiple($ele
drupal_add_tabledrag($table_id, 'order', 'sibling', $weight_class);
$output = '';
- $output = empty($rows) ? '' : theme('table', $headers, $rows, array('id' => $table_id));
+ $output = empty($rows) ? '' : theme('table', array('header' => $headers, 'rows' => $rows, 'attributes' => array('id' => $table_id)));
$output .= drupal_render_children($element);
return $output;
}
@@ -848,14 +852,20 @@ function theme_file_widget_multiple($ele
/**
* Generate help text based on upload validators.
*
- * @param $description
- * The normal description for this field, specified by the user.
- * @param $upload_validators
- * An array of upload validators as used in $element['#upload_validators'].
+ * @param $variables
+ * An associative array containing:
+ * - description: The normal description for this field, specified by the
+ * user.
+ * - upload_validators: An array of upload validators as used in
+ * $element['#upload_validators'].
+ *
* @return
* A string suitable for a file field description.
*/
-function theme_file_upload_help($description, $upload_validators) {
+function theme_file_upload_help($variables) {
+ $description = $variables['description'];
+ $upload_validators = $variables['upload_validators'];
+
$descriptions = array();
if (strlen($description)) {
@@ -890,29 +900,33 @@ function theme_file_upload_help($descrip
/**
* Theme function for 'default' file field formatter.
*/
-function theme_field_formatter_file_default($element) {
- return theme('file_link', (object) $element['#item']);
+function theme_field_formatter_file_default($variables) {
+ $element = $variables['element'];
+ return theme('file_link', array('file' => (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) {
+ $element = $variables['element'];
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) {
+ $element = $variables['element'];
+
$header = array(t('Attachment'), t('Size'));
$rows = array();
foreach (element_children($element) as $key) {
$rows[] = array(
- theme('file_link', (object) $element[$key]['#item']),
+ theme('file_link', array('file' => (object) $element[$key]['#item'])),
format_size($element[$key]['#item']['filesize']),
);
}
- return empty($rows) ? '' : theme('table', $header, $rows);
+ return empty($rows) ? '' : theme('table', array('header' => $header, 'rows' => $rows));
}
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 8 Oct 2009 16:11:55 -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),
),
);
}
@@ -413,7 +413,7 @@ function file_managed_file_process($elem
if ($fid && $element['#file']) {
$element['filename'] = array(
'#type' => 'markup',
- '#markup' => theme('file_link', $element['#file']) . ' ',
+ '#markup' => theme('file_link', array('file' => $element['#file'])) . ' ',
'#weight' => -10,
);
}
@@ -577,7 +577,9 @@ function file_managed_file_save_upload($
/**
* Theme a managed file element.
*/
-function theme_file_managed_file($element) {
+function theme_file_managed_file($variables) {
+ $element = $variables['element'];
+
// This wrapper is required to apply JS behaviors and CSS styling.
$output = '';
$output .= '
';
@@ -589,12 +591,15 @@ function theme_file_managed_file($elemen
/**
* Output a link to a file.
*
- * @param $file
- * A file object to which the link will be created.
+ * @param $variables
+ * An associative array containing:
+ * - file: A file object to which the link will be created.
*/
-function theme_file_link($file) {
+function theme_file_link($variables) {
+ $file = $variables['file'];
+
$url = file_create_url($file->uri);
- $icon = theme('file_icon', $file);
+ $icon = theme('file_icon', array('file' => $file));
// Set options as per anchor format described at
// http://microformats.org/wiki/file-format-examples
@@ -619,10 +624,13 @@ function theme_file_link($file) {
/**
* Return an image with an appropriate icon for the given file.
*
- * @param $file
- * A file object for which to make an icon.
+ * @param $variables
+ * An associative array containing:
+ * - file: A file object for which to make an icon.
*/
-function theme_file_icon($file) {
+function theme_file_icon($variables) {
+ $file = $variables['file'];
+
$mime = check_plain($file->filemime);
$icon_url = file_icon_url($file);
return '
';
Index: modules/file/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/tests/file.test,v
retrieving revision 1.2
diff -u -p -r1.2 file.test
--- modules/file/tests/file.test 20 Sep 2009 17:40:41 -0000 1.2
+++ modules/file/tests/file.test 8 Oct 2009 16:11:55 -0000
@@ -304,7 +304,7 @@ class FileFieldDisplayTestCase extends F
// Check that the default formatter is displaying with the file name.
$node = node_load($nid, NULL, TRUE);
$node_file = (object) $node->{$field_name}[FIELD_LANGUAGE_NONE][0];
- $default_output = theme('file_link', $node_file);
+ $default_output = theme('file_link', array('file' => $node_file));
$this->assertRaw($default_output, t('Default formatter displaying correctly on full node view.'));
// Turn the "display" option off and check that the file is no longer displayed.
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.47
diff -u -p -r1.47 filter.admin.inc
--- modules/filter/filter.admin.inc 25 Sep 2009 14:06:09 -0000 1.47
+++ modules/filter/filter.admin.inc 8 Oct 2009 16:11:55 -0000
@@ -23,8 +23,8 @@ function filter_admin_overview($form) {
// to all roles and cannot be deleted via the admin interface.
$form['formats'][$id]['#is_fallback'] = ($id == $fallback_format);
if ($form['formats'][$id]['#is_fallback']) {
- $form['formats'][$id]['name'] = array('#markup' => theme('placeholder', $format->name));
- $roles_markup = theme('placeholder', t('All roles may use this format'));
+ $form['formats'][$id]['name'] = array('#markup' => theme('placeholder', array('text' => $format->name)));
+ $roles_markup = theme('placeholder', array('text' => t('All roles may use this format')));
}
else {
$form['formats'][$id]['name'] = array('#markup' => check_plain($format->name));
@@ -59,7 +59,9 @@ function filter_admin_overview_submit($f
*
* @ingroup themeable
*/
-function theme_filter_admin_overview($form) {
+function theme_filter_admin_overview($variables) {
+ $form = $variables['form'];
+
$rows = array();
foreach (element_children($form['formats']) as $id) {
$form['formats'][$id]['weight']['#attributes']['class'] = array('text-format-order-weight');
@@ -75,7 +77,7 @@ function theme_filter_admin_overview($fo
);
}
$header = array(t('Name'), t('Roles'), t('Weight'), array('data' => t('Operations'), 'colspan' => 2));
- $output = theme('table', $header, $rows, array('id' => 'text-format-order'));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'text-format-order')));
$output .= drupal_render_children($form);
drupal_add_tabledrag('text-format-order', 'order', 'sibling', 'text-format-order-weight');
@@ -153,7 +155,7 @@ function filter_admin_format_form($form,
// Composition tips (guidelines)
$tips = _filter_tips($format->format, FALSE);
- $tiplist = theme('filter_tips', $tips, FALSE);
+ $tiplist = theme('filter_tips', array('tips' => $tips, 'long' => FALSE));
if (!$tiplist) {
$tiplist = '
' . t('No guidelines available.') . '
'; } @@ -342,7 +344,9 @@ function filter_admin_order($form, &$for * * @ingroup themeable */ -function theme_filter_admin_order($form) { +function theme_filter_admin_order($variables) { + $form = $variables['form']; + $header = array(t('Name'), t('Weight')); $rows = array(); foreach (element_children($form['names']) as $id) { @@ -356,7 +360,7 @@ function theme_filter_admin_order($form) } } - $output = theme('table', $header, $rows, array('id' => 'filter-order')); + $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'filter-order'))); $output .= drupal_render_children($form); drupal_add_tabledrag('filter-order', 'order', 'sibling', 'filter-order-weight', NULL, NULL, FALSE); Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.293 diff -u -p -r1.293 filter.module --- modules/filter/filter.module 5 Oct 2009 01:18:25 -0000 1.293 +++ modules/filter/filter.module 8 Oct 2009 16:11:55 -0000 @@ -265,7 +265,7 @@ function filter_permission() { if (!empty($permission)) { // Only link to the text format configuration page if the user who is // viewing this will have access to that page. - $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', $format->name); + $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name)); $perms[$permission] = array( 'title' => t("Use the %text_format text format", array('%text_format' => $format->name)), 'description' => t('Use !text_format in forms when entering or editing content. %warning', array('!text_format' => $format_name_replacement, '%warning' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), @@ -371,7 +371,7 @@ function _filter_html_tips($filter, $for ); } } - $output .= theme('table', $header, $rows); + $output .= theme('table', array('header' => $header, 'rows' => $rows)); $output .= '' . t('Most unusual characters can be directly entered without any problems.') . '
'; $output .= '' . t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '
'; @@ -391,7 +391,7 @@ function _filter_html_tips($filter, $for array('data' => $entity[1], 'class' => array('get')) ); } - $output .= theme('table', $header, $rows); + $output .= theme('table', array('header' => $header, 'rows' => $rows)); return $output; } @@ -761,7 +761,7 @@ function filter_form($selected_format = foreach ($formats as $format) { $options[$format->format] = $format->name; $form['format_guidelines'][$format->format] = array( - '#markup' => theme('filter_guidelines', $format), + '#markup' => theme('filter_guidelines', array('format' => $format)), ); } $form['format'] = array( @@ -906,9 +906,11 @@ function theme_filter_tips_more_info() { * * @ingroup themeable */ -function theme_filter_guidelines($format) { +function theme_filter_guidelines($variables) { + $format = $variables['format']; + $name = isset($format->name) ? '' : ''; - return '' . $name . theme('filter_tips', _filter_tips($format->format, FALSE)) . '
';
+ return '' . $name . theme('filter_tips', array('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 8 Oct 2009 16:11:55 -0000
@@ -13,10 +13,10 @@
function filter_tips_long() {
$format = arg(2);
if ($format) {
- $output = theme('filter_tips', _filter_tips($format, TRUE), TRUE);
+ $output = theme('filter_tips', array('tips' => _filter_tips($format, TRUE), 'long' => TRUE));
}
else {
- $output = theme('filter_tips', _filter_tips(-1, TRUE), TRUE);
+ $output = theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE));
}
return $output;
}
@@ -25,30 +25,32 @@ function filter_tips_long() {
/**
* Render HTML for a set of filter tips.
*
- * @param $tips
- * An array containing descriptions and a CSS id in the form of
- * 'module-name/filter-id' (only used when $long is TRUE) for each
- * filter in one or more text formats. Example:
- * @code
- * array(
- * 'Full HTML' => array(
- * 0 => array(
- * 'tip' => 'Web page addresses and e-mail addresses turn into links automatically.',
- * 'id' => 'filter/2',
+ * @param $variables
+ * An associative array containing:
+ * - tips: An array containing descriptions and a CSS id in the form of
+ * 'module-name/filter-id' (only used when $long is TRUE) for each
+ * filter in one or more text formats. Example:
+ * @code
+ * array(
+ * 'Full HTML' => array(
+ * 0 => array(
+ * 'tip' => 'Web page addresses and e-mail addresses turn into links automatically.',
+ * 'id' => 'filter/2',
+ * ),
* ),
- * ),
- * );
- * @endcode
- * @param $long
- * (optional) Whether the passed in filter tips contain extended explanations,
- * i.e. intended to be output on the path 'filter/tips' (TRUE), or are in a
- * short format, i.e. suitable to be displayed below a form element. Defaults
- * to FALSE.
+ * );
+ * @endcode
+ * - long: (optional) Whether the passed in filter tips contain extended
+ * explanations, i.e. intended to be output on the path 'filter/tips'
+ * (TRUE), or are in a short format, i.e. suitable to be displayed below a
+ * form element. Defaults to FALSE.
*
* @see _filter_tips()
* @ingroup themeable
*/
-function theme_filter_tips($tips, $long = FALSE) {
+function theme_filter_tips($variables) {
+ $tips = $variables['tips'];
+ $long = $variables['long'];
$output = '';
$multiple = count($tips) > 1;
Index: modules/forum/forum-icon.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-icon.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 forum-icon.tpl.php
--- modules/forum/forum-icon.tpl.php 8 Mar 2009 20:58:19 -0000 1.5
+++ modules/forum/forum-icon.tpl.php 8 Oct 2009 16:11:55 -0000
@@ -18,7 +18,7 @@
-
+ "misc/forum-$icon.png")) ?>
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.520
diff -u -p -r1.520 forum.module
--- modules/forum/forum.module 8 Oct 2009 07:58:45 -0000 1.520
+++ modules/forum/forum.module 8 Oct 2009 16:11:56 -0000
@@ -596,7 +596,7 @@ function forum_block_view_pre_render($el
$result = $elements['#query']->execute();
if ($node_title_list = node_title_list($result)) {
$elements['forum_list'] = array('#markup' => $node_title_list);
- $elements['forum_more'] = array('#markup' => theme('more_link', url('forum'), t('Read the latest forum topics.')));
+ $elements['forum_more'] = array('#markup' => theme('more_link', array('url' => url('forum'), 'title' => t('Read the latest forum topics.'))));
}
return $elements;
}
@@ -869,14 +869,14 @@ function template_preprocess_forums(&$va
$variables['links'] = $forum_types;
if (!empty($variables['forums'])) {
- $variables['forums'] = theme('forum_list', $variables['forums'], $variables['parents'], $variables['tid']);
+ $variables['forums'] = theme('forum_list', $variables);
}
else {
$variables['forums'] = '';
}
if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) {
- $variables['topics'] = theme('forum_topic_list', $variables['tid'], $variables['topics'], $variables['sortby'], $variables['forum_per_page']);
+ $variables['topics'] = theme('forum_topic_list', $variables);
drupal_add_feed(url('taxonomy/term/' . $variables['tid'] . '/0/feed'), 'RSS - ' . $title);
}
else {
@@ -943,7 +943,7 @@ function template_preprocess_forum_list(
}
$variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics;
}
- $variables['forums'][$id]->last_reply = theme('forum_submitted', $forum->last_post);
+ $variables['forums'][$id]->last_reply = theme('forum_submitted', array('topic' => $forum->last_post));
}
// Give meaning to $tid for themers. $tid actually stands for term id.
$variables['forum_id'] = $variables['tid'];
@@ -977,7 +977,7 @@ function template_preprocess_forum_topic
if (!empty($variables['topics'])) {
$row = 0;
foreach ($variables['topics'] as $id => $topic) {
- $variables['topics'][$id]->icon = theme('forum_icon', $topic->new, $topic->comment_count, $topic->comment_mode, $topic->sticky);
+ $variables['topics'][$id]->icon = theme('forum_icon', array('new_posts' => $topic->new, 'num_posts' => $topic->comment_count, 'comment_mode' => $topic->comment_mode, 'sticky' => $topic->sticky));
$variables['topics'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';
$row++;
@@ -995,8 +995,8 @@ function template_preprocess_forum_topic
$variables['topics'][$id]->message = '';
}
$topic->uid = $topic->last_comment_uid ? $topic->last_comment_uid : $topic->uid;
- $variables['topics'][$id]->created = theme('forum_submitted', $topic);
- $variables['topics'][$id]->last_reply = theme('forum_submitted', isset($topic->last_reply) ? $topic->last_reply : NULL);
+ $variables['topics'][$id]->created = theme('forum_submitted', array('topic' => $topic));
+ $variables['topics'][$id]->last_reply = theme('forum_submitted', array('topic' => isset($topic->last_reply) ? $topic->last_reply : NULL));
$variables['topics'][$id]->new_text = '';
$variables['topics'][$id]->new_url = '';
@@ -1015,7 +1015,7 @@ function template_preprocess_forum_topic
$variables['topic_id'] = $variables['tid'];
unset($variables['tid']);
- $variables['pager'] = theme('pager', NULL);
+ $variables['pager'] = theme('pager', array('tags' => NULL));
}
/**
@@ -1057,7 +1057,7 @@ function template_preprocess_forum_icon(
* @see theme_forum_submitted()
*/
function template_preprocess_forum_submitted(&$variables) {
- $variables['author'] = isset($variables['topic']->uid) ? theme('username', $variables['topic']) : '';
+ $variables['author'] = isset($variables['topic']->uid) ? theme('username', array('account' => $variables['topic'])) : '';
$variables['time'] = isset($variables['topic']->created) ? format_interval(REQUEST_TIME - $variables['topic']->created) : '';
}
Index: modules/forum/forum.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.pages.inc,v
retrieving revision 1.2
diff -u -p -r1.2 forum.pages.inc
--- modules/forum/forum.pages.inc 26 Jul 2007 06:48:03 -0000 1.2
+++ modules/forum/forum.pages.inc 8 Oct 2009 16:11:56 -0000
@@ -20,5 +20,5 @@ function forum_page($tid = 0) {
$topics = forum_get_topics($tid, $sortby, $forum_per_page);
}
- return theme('forums', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
+ return theme('forums', array('forums' => $forums, 'topics' => $topics, 'parents' => $parents, 'tid' => $tid, 'sortby' => $sortby, 'forums_per_page' => $forum_per_page));
}
Index: modules/forum/forums.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forums.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 forums.tpl.php
--- modules/forum/forums.tpl.php 13 Oct 2008 12:31:42 -0000 1.5
+++ modules/forum/forums.tpl.php 8 Oct 2009 16:11:56 -0000
@@ -20,7 +20,7 @@
?>
-
+ $links)); ?>
Index: modules/help/help.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.admin.inc,v
retrieving revision 1.9
diff -u -p -r1.9 help.admin.inc
--- modules/help/help.admin.inc 6 Jun 2009 16:05:26 -0000 1.9
+++ modules/help/help.admin.inc 8 Oct 2009 16:11:56 -0000
@@ -38,7 +38,7 @@ function help_page($name) {
$admin_tasks = system_get_module_admin_tasks($name);
if (!empty($admin_tasks)) {
ksort($admin_tasks);
- $output .= theme('item_list', $admin_tasks, t('@module administration pages', array('@module' => $module['name'])));
+ $output .= theme('item_list', array('items' => $admin_tasks, 'title' => t('@module administration pages', array('@module' => $module['name']))));
}
}
Index: modules/image/image.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v
retrieving revision 1.11
diff -u -p -r1.11 image.admin.inc
--- modules/image/image.admin.inc 18 Sep 2009 00:12:46 -0000 1.11
+++ modules/image/image.admin.inc 8 Oct 2009 16:11:56 -0000
@@ -14,7 +14,7 @@ function image_style_list() {
$styles = image_styles();
$page['image_style_list'] = array(
- '#markup' => theme('image_style_list', $styles),
+ '#markup' => theme('image_style_list', array('styles' => $styles)),
'#attached' => array(
'css' => array(drupal_get_path('module', 'image') . '/image.admin.css' => array('preprocess' => FALSE)),
),
@@ -64,7 +64,7 @@ function image_style_form($form, &$form_
'#markup' => $effect['label'],
);
$form['effects'][$ieid]['summary'] = array(
- '#markup' => isset($effect['summary theme']) ? theme($effect['summary theme'], $effect['data']) : '',
+ '#markup' => isset($effect['summary theme']) ? theme($effect['summary theme'], array('data' => $effect['data'])) : '',
);
$form['effects'][$ieid]['weight'] = array(
'#type' => 'weight',
@@ -106,7 +106,7 @@ function image_style_form($form, &$form_
$form['preview'] = array(
'#type' => 'item',
'#title' => t('Preview'),
- '#markup' => theme('image_style_preview', $style),
+ '#markup' => theme('image_style_preview', array('style' => $style)),
);
$form['submit'] = array(
'#type' => 'submit',
@@ -555,12 +555,16 @@ function image_rotate_form($data) {
/**
* Display the page containing the list of image styles.
*
- * @param $styles
- * An array of all the image styles returned by image_get_styles().
+ * @param $variables
+ * An associative array containing:
+ * - styles: An array of all the image styles returned by image_get_styles().
+ *
* @see image_get_styles()
* @ingroup themeable
*/
-function theme_image_style_list($styles) {
+function theme_image_style_list($variables) {
+ $styles = $variables['styles'];
+
$header = array(t('Style name'), array('data' => t('Operations'), 'colspan' => 3));
$rows = array();
foreach ($styles as $style) {
@@ -583,17 +587,21 @@ function theme_image_style_list($styles)
));
}
- return theme('table', $header, $rows);
+ return theme('table', array('header' => $header, 'rows' => $rows));
}
/**
* Theme callback for listing the effects within a specific image style.
*
- * @param $form
- * An associative array containing the structure of the effects group.
+ * @param $variables
+ * An associative array containing:
+ * - form: An associative array containing the structure of the effects group.
+ *
* @ingroup themeable
*/
-function theme_image_style_effects($form) {
+function theme_image_style_effects($variables) {
+ $form = $variables['form'];
+
$rows = array();
foreach (element_children($form) as $key) {
@@ -634,7 +642,7 @@ function theme_image_style_effects($form
)));
}
- $output = theme('table', $header, $rows, array('id' => 'image-style-effects'));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'image-style-effects')));
drupal_add_tabledrag('image-style-effects', 'order', 'sibling', 'image-effect-order-weight');
return $output;
}
@@ -642,11 +650,15 @@ function theme_image_style_effects($form
/**
* Theme callback for displaying a preview of an image style.
*
- * @param $style
- * The image style array being previewed.
+ * @param $variables
+ * An associative array containing:
+ * - style: The image style array being previewed.
+ *
* @ingroup themeable
*/
-function theme_image_style_preview($style) {
+function theme_image_style_preview($variables) {
+ $style = $variables['style'];
+
$sample_image = variable_get('image_style_preview_image', drupal_get_path('module', 'image') . '/sample.png');
$sample_width = 160;
$sample_height = 160;
@@ -690,7 +702,7 @@ function theme_image_style_preview($styl
$output .= '';
$output .= t('original') . ' (' . l(t('view actual size'), $original_path) . ')';
$output .= '
';
- $output .= '' . theme('image', $original_path . '?' . time(), t('Sample original image'), '', $original_attributes, FALSE) . '';
+ $output .= '' . theme('image', array('path' => $original_path . '?' . time(), 'alt' => t('Sample original image'), 'title' => '', 'attributes' => $original_attributes, 'getsize' => FALSE)) . '';
$output .= '
'; // End preview-image.
@@ -700,7 +712,7 @@ function theme_image_style_preview($styl
$output .= '' . $original_image['height'] . 'px
';
$output .= '' . $original_image['width'] . 'px
';
$output .= '';
$output .= check_plain($style['name']) . ' (' . l(t('view actual size'), file_create_url($preview_file) . '?' . time()) . ')';
$output .= '
';
- $output .= '' . theme('image', file_create_url($preview_file) . '?' . time(), t('Sample modified image'), '', $preview_attributes, FALSE) . '';
+ $output .= '' . theme('image', array('path' => file_create_url($preview_file) . '?' . time(), 'alt' => t('Sample modified image'), 'title' => '', 'attributes' => $preview_attributes, 'getsize' => FALSE)) . '';
$output .= '
'; // End preview-image.
@@ -714,11 +726,15 @@ function theme_image_style_preview($styl
/**
* Theme callback for displaying a grid of checkboxes.
*
- * @param $element
- * A Form API element containing radio buttons.
+ * @param $variables
+ * An associative array containing:
+ * - element: A Form API element containing radio buttons.
+ *
* @ingroup themeable
*/
-function theme_image_anchor($element) {
+function theme_image_anchor($variables) {
+ $element = $variables['element'];
+
$rows = array();
$row = array();
foreach (element_children($element) as $n => $key) {
@@ -731,17 +747,21 @@ function theme_image_anchor($element) {
}
}
- return theme('table', array(), $rows, array('class' => array('image-anchor')));
+ return theme('table', array('header' => array(), 'rows' => $rows, 'attributes' => array('class' => array('image-anchor'))));
}
/**
* Theme callback for image resize effect summary output.
*
- * @param $data
- * The current configuration for this resize effect.
+ * @param $variables
+ * An associative array containing:
+ * - data: The current configuration for this resize effect.
+ *
* @ingroup themeable
*/
-function theme_image_resize_summary($data) {
+function theme_image_resize_summary($variables) {
+ $data = $variables['data'];
+
if ($data['width'] && $data['height']) {
return check_plain($data['width']) . 'x' . check_plain($data['height']);
}
@@ -753,32 +773,40 @@ function theme_image_resize_summary($dat
/**
* Theme callback for image scale effect summary output.
*
- * @param $data
- * The current configuration for this scale effect.
+ * @param $variables
+ * An associative array containing:
+ * - data: The current configuration for this scale effect.
+ *
* @ingroup themeable
*/
-function theme_image_scale_summary($data) {
- return theme('image_resize_summary', $data) . ' ' . ($data['upscale'] ? '(' . t('upscaling allowed') . ')' : '');
+function theme_image_scale_summary($variables) {
+ $data = $variables['data'];
+ return theme('image_resize_summary', array('data' => $data)) . ' ' . ($data['upscale'] ? '(' . t('upscaling allowed') . ')' : '');
}
/**
* Theme callback for image crop effect summary output.
*
- * @param $data
- * The current configuration for this crop effect.
+ * @param $variables
+ * An associative array containing:
+ * - data: The current configuration for this crop effect.
+ *
* @ingroup themeable
*/
-function theme_image_crop_summary($data) {
- return theme('image_resize_summary', $data);
+function theme_image_crop_summary($variables) {
+ return theme('image_resize_summary', $variables);
}
/**
* Theme callback for image rotate effect summary output.
*
- * @param $data
- * The current configuration for this rotate effect.
+ * @param $variables
+ * An associative array containing:
+ * - data: The current configuration for this rotate effect.
+ *
* @ingroup themeable
*/
-function theme_image_rotate_summary($data) {
+function theme_image_rotate_summary($variables) {
+ $data = $variables['data'];
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.17
diff -u -p -r1.17 image.module
--- modules/image/image.module 30 Sep 2009 18:36:02 -0000 1.17
+++ modules/image/image.module 8 Oct 2009 16:11:56 -0000
@@ -20,7 +20,7 @@ function image_help($path, $arg) {
$output .= '' . $preview_image['height'] . 'px
';
$output .= '' . $preview_image['width'] . 'px
';
$output .= '' . t('Image styles') . '
'; $output .= '' . t('Image styles allow your site to output an image in several different ways without affecting the original image. Any created images will automatically be refreshed if any changes are made to the image style.') .'
'; $output .= '' . t('Every image style must have a name, which will be used in the URL of generated images. There are two common approaches to naming image styles:') . '
'; - $output .= theme('item_list', $naming_approaches); + $output .= theme('item_list', array('items' => $naming_approaches)); $output .= '' . t('Both approaches are common and which you choose depends on how you use the image style.') . '
'; $output .= '' . t('After creating an image style, effects may be added to the style. Image module comes with some basic effects such as crop, scale, desaturate, and rotate. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the crop and scale effect and the desaturate effect, you could create square, grayscale thumbnails.'); return $output; @@ -128,7 +128,7 @@ function image_theme() { return array( 'image_style' => array( 'arguments' => array( - 'style' => NULL, + 'style_name' => NULL, 'path' => NULL, 'alt' => '', 'title' => '', @@ -782,27 +782,27 @@ function image_effect_apply($image, $eff /** * Return a themed image using a specific image style. * - * @param $style_name - * The name of the style to be used to alter the original image. - * @param $path - * The path of the image file relative to the Drupal files directory. - * This function does not work with images outside the files directory nor - * with remotely hosted images. - * @param $alt - * The alternative text for text-based browsers. - * @param $title - * The title text is displayed when the image is hovered in some popular - * browsers. - * @param $attributes - * Associative array of attributes to be placed in the img tag. - * @param $getsize - * If set to TRUE, the image's dimension are fetched and added as - * width/height attributes. + * @param $variables + * An associative array containing: + * - style_name: The name of the style to be used to alter the original image. + * - path: The path of the image file relative to the Drupal files directory. + * This function does not work with images outside the files directory nor + * with remotely hosted images. + * - alt: The alternative text for text-based browsers. + * - title: The title text is displayed when the image is hovered in some + * popular browsers. + * - attributes: Associative array of attributes to be placed in the img tag. + * - getsize: If set to TRUE, the image's dimension are fetched and added as + * width/height attributes. + * * @return * 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) { + $style_name = $variables['style_name']; + $path = $variables['path']; + // 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. @@ -810,7 +810,8 @@ function theme_image_style($style_name, if (!file_exists($style_path)) { $style_path = image_style_url($style_name, $path); } - return theme('image', file_create_url($style_path), $alt, $title, $attributes, $getsize); + $variables['path'] = file_create_url($style_path); + return theme('image', $variables); } /** Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.259 diff -u -p -r1.259 locale.module --- modules/locale/locale.module 22 Sep 2009 07:50:16 -0000 1.259 +++ modules/locale/locale.module 8 Oct 2009 16:11:56 -0000 @@ -656,7 +656,7 @@ function locale_block_view($delta = '') drupal_alter('translation_link', $links, $path); $block['subject'] = t('Languages'); - $block['content'] = theme('links', $links, array()); + $block['content'] = theme('links', array('links' => $links, 'attributes' => array())); return $block; } } @@ -666,8 +666,10 @@ function locale_block_view($delta = '') * * @ingroup themeable */ -function theme_locale_translation_filters($form) { +function theme_locale_translation_filters($variables) { + $form = $variables['form']; $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.61 diff -u -p -r1.61 menu.admin.inc --- modules/menu/menu.admin.inc 3 Oct 2009 01:16:02 -0000 1.61 +++ modules/menu/menu.admin.inc 8 Oct 2009 16:11:56 -0000 @@ -14,22 +14,22 @@ function menu_overview_page() { $header = array(t('Title'), array('data' => t('Operations'), 'colspan' => '3')); $rows = array(); foreach ($result as $menu) { - $row = array(theme('menu_admin_overview', $menu['title'], $menu['menu_name'], $menu['description'])); + $row = array(theme('menu_admin_overview', array('title' => $menu['title'], 'name' => $menu['menu_name'], 'description' => $menu['description']))); $row[] = array('data' => l(t('list links'), 'admin/structure/menu/manage/' . $menu['menu_name'])); $row[] = array('data' => l(t('edit menu'), 'admin/structure/menu/manage/' . $menu['menu_name'] . '/edit')); $row[] = array('data' => l(t('add link'), 'admin/structure/menu/manage/' . $menu['menu_name'] . '/add')); $rows[] = $row; } - return theme('table', $header, $rows); + return theme('table', array('header' => $header, 'rows' => $rows)); } /** * Theme the menu title and description for admin page */ -function theme_menu_admin_overview($title, $name, $description) { - $output = check_plain($title); - $output .= '
' . filter_xss_admin($description) . '
';
+function theme_menu_admin_overview($variables) {
+ $output = check_plain($variables['title']);
+ $output .= '' . filter_xss_admin($variables['description']) . '
';
return $output;
}
@@ -186,7 +186,9 @@ function menu_overview_form_submit($form
*
* @ingroup themeable
*/
-function theme_menu_overview_form($form) {
+function theme_menu_overview_form($variables) {
+ $form = $variables['form'];
+
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');
@@ -220,7 +222,7 @@ function theme_menu_overview_form($form)
$element['plid']['#type'] = 'hidden';
$row = array();
- $row[] = theme('indentation', $element['#item']['depth'] - 1) . drupal_render($element['title']);
+ $row[] = theme('indentation', array('size' => $element['#item']['depth'] - 1)) . drupal_render($element['title']);
$row[] = array('data' => drupal_render($element['hidden']), 'class' => array('checkbox'));
$row[] = array('data' => drupal_render($element['expanded']), 'class' => array('checkbox'));
$row[] = drupal_render($element['weight']) . drupal_render($element['plid']) . drupal_render($element['mlid']);
@@ -235,7 +237,7 @@ function theme_menu_overview_form($form)
if (empty($rows)) {
$rows[] = array(array('data' => $form['#empty_text'], 'colspan' => '7'));
}
- $output .= theme('table', $header, $rows, array('id' => 'menu-overview'));
+ $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'menu-overview')));
$output .= drupal_render_children($form);
return $output;
}
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.95
diff -u -p -r1.95 content_types.inc
--- modules/node/content_types.inc 28 Sep 2009 22:14:30 -0000 1.95
+++ modules/node/content_types.inc 8 Oct 2009 16:11:56 -0000
@@ -16,10 +16,10 @@ function node_overview_types() {
$rows = array();
foreach ($names as $key => $name) {
- $type = $types[$key];
+ $type = $types[$key];
if (node_hook($type->type, 'form')) {
$type_url_str = str_replace('_', '-', $type->type);
- $row = array(theme('node_admin_overview', $name, $type));
+ $row = array(theme('node_admin_overview', array('name' => $name, 'type' => $type)));
// Set the edit column.
$row[] = array('data' => l(t('edit'), 'admin/structure/types/manage/' . $type_url_str));
@@ -47,7 +47,10 @@ function node_overview_types() {
return $build;
}
-function theme_node_admin_overview($name, $type) {
+function theme_node_admin_overview($variables) {
+ $name = $variables['name'];
+ $type = $variables['type'];
+
$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.67
diff -u -p -r1.67 node.admin.inc
--- modules/node/node.admin.inc 18 Sep 2009 00:12:47 -0000 1.67
+++ modules/node/node.admin.inc 8 Oct 2009 16:11:56 -0000
@@ -192,8 +192,10 @@ function node_filter_form() {
*
* @ingroup themeable
*/
-function theme_node_filter_form($form) {
+function theme_node_filter_form($variables) {
+ $form = $variables['form'];
$output = '';
+
$output .= '';
$output .= drupal_render($form['filters']);
$output .= '
';
@@ -206,8 +208,10 @@ function theme_node_filter_form($form) {
*
* @ingroup themeable
*/
-function theme_node_filters($form) {
+function theme_node_filters($variables) {
+ $form = $variables['form'];
$output = '';
+
$output .= '- ';
if (!empty($form['current'])) {
foreach (element_children($form['current']) as $key) {
@@ -358,7 +362,7 @@ function _node_mass_update_batch_finishe
else {
drupal_set_message(t('An error occurred and processing did not complete.'), 'error');
$message = format_plural(count($results), '1 item successfully processed:', '@count items successfully processed:');
- $message .= theme('item_list', $results);
+ $message .= theme('item_list', array('items' => $results));
drupal_set_message($message);
}
}
@@ -373,7 +377,7 @@ function node_admin_content($form, $form
// Show the 'add new content' link.
$form['add_content'] = array(
'#access' => _node_add_access(),
- '#markup' => theme('links', array(array('title' => t('Add new content'), 'href' => 'node/add')), array('class' => array('action-links'))),
+ '#markup' => theme('links', array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
);
$form[] = node_filter_form();
$form['#submit'][] = 'node_filter_form_submit';
@@ -447,9 +451,9 @@ function node_admin_nodes() {
foreach ($result as $node) {
$nodes[$node->nid] = '';
$options = empty($node->language) ? array() : array('language' => $languages[$node->language]);
- $form['title'][$node->nid] = array('#markup' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', node_mark($node->nid, $node->changed)));
+ $form['title'][$node->nid] = array('#markup' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))));
$form['name'][$node->nid] = array('#markup' => check_plain(node_type_get_name($node)));
- $form['username'][$node->nid] = array('#markup' => theme('username', $node));
+ $form['username'][$node->nid] = array('#markup' => theme('username', array('account' => $node)));
$form['status'][$node->nid] = array('#markup' => ($node->status ? t('published') : t('not published')));
$form['changed'][$node->nid] = array('#markup' => format_date($node->changed, 'short'));
if ($multilanguage) {
@@ -461,7 +465,7 @@ function node_admin_nodes() {
'#type' => 'checkboxes',
'#options' => $nodes,
);
- $form['pager'] = array('#markup' => theme('pager', NULL));
+ $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL)));
$form['#theme'] = 'node_admin_nodes';
return $form;
}
@@ -514,8 +518,10 @@ function node_admin_nodes_submit($form,
*
* @ingroup themeable
*/
-function theme_node_admin_nodes($form) {
+function theme_node_admin_nodes($variables) {
+ $form = $variables['form'];
$output = '';
+
$output .= drupal_render($form['options']);
$header = $form['header']['#value'];
@@ -544,7 +550,7 @@ function theme_node_admin_nodes($form) {
);
}
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
if ($form['pager']['#markup']) {
$output .= drupal_render($form['pager']);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1140
diff -u -p -r1.1140 node.module
--- modules/node/node.module 8 Oct 2009 15:36:18 -0000 1.1140
+++ modules/node/node.module 8 Oct 2009 16:11:56 -0000
@@ -274,7 +274,7 @@ function node_title_list($result, $title
$num_rows = TRUE;
}
- return $num_rows ? theme('node_list', $items, $title) : FALSE;
+ return $num_rows ? theme('node_list', array('items' => $items, 'title' => $title)) : FALSE;
}
/**
@@ -282,8 +282,8 @@ function node_title_list($result, $title
*
* @ingroup themeable
*/
-function theme_node_list($items, $title = NULL) {
- return theme('item_list', $items, $title);
+function theme_node_list($variables) {
+ return theme('item_list', $variables);
}
/**
@@ -1166,7 +1166,7 @@ function template_preprocess_node(&$vari
$node = $variables['node'];
$variables['date'] = format_date($node->created);
- $variables['name'] = theme('username', $node);
+ $variables['name'] = theme('username', array('account' => $node));
$variables['node_url'] = url('node/' . $node->nid);
$variables['title'] = check_plain($node->title);
$variables['page'] = (bool)menu_get_object();
@@ -1189,7 +1189,7 @@ function template_preprocess_node(&$vari
// Display post information only on certain node types.
if (variable_get('node_submitted_' . $node->type, TRUE)) {
$variables['display_submitted'] = TRUE;
- $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
+ $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
}
else {
$variables['display_submitted'] = FALSE;
@@ -1224,8 +1224,8 @@ function template_preprocess_node(&$vari
*
* @ingroup themeable
*/
-function theme_node_log_message($log) {
- return '
' . t('Log') . ':
' . $log . '' . t('Log') . ':
' . $variables['log'] . '\n";
$output .= " ';
foreach ($requirements as $requirement) {
@@ -2149,11 +2169,15 @@ function theme_status_report($requiremen
/**
* Theme callback for the modules form.
*
- * @param $form
- * An associative array containing the structure of the form.
+ * @param $variables
+ * An associative array containing:
+ * - form: An associative array containing the structure of the form.
+ *
* @ingroup themeable
*/
-function theme_system_modules_fieldset($form) {
+function theme_system_modules_fieldset($variables) {
+ $form = $variables['form'];
+
// Individual table headers.
$rows = array();
// Iterate through all the modules, which are
@@ -2188,32 +2212,40 @@ function theme_system_modules_fieldset($
$rows[] = $row;
}
- return theme('table', $form['#header'], $rows);
+ return theme('table', array('header' => $form['#header'], 'rows' => $rows));
}
/**
* Themes an incompatible message.
*
* @ingroup themeable
- * @param $message
- * The form array representing the currently disabled modules.
+ *
+ * @param $variables
+ * An associative array containing:
+ * - message: The form array representing the currently disabled modules.
+ *
* @return
* An HTML string for the message.
*/
-function theme_system_modules_incompatible($message) {
- return '';
$output .= '
\n";
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.260
diff -u -p -r1.260 upload.module
--- modules/upload/upload.module 25 Sep 2009 14:24:34 -0000 1.260
+++ modules/upload/upload.module 8 Oct 2009 16:11:57 -0000
@@ -436,7 +436,9 @@ function upload_node_search_result($node
*
* @ingroup themeable
*/
-function theme_upload_attachments($elements) {
+function theme_upload_attachments($variables) {
+ $elements = $variables['elements'];
+
$header = array(t('Attachment'), t('Size'));
$rows = array();
foreach ($elements['#files'] as $file) {
@@ -448,7 +450,7 @@ function theme_upload_attachments($eleme
}
}
if (count($rows)) {
- return theme('table', $header, $rows, array('class' => array('attachments')));
+ return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('attachments'))));
}
}
@@ -600,7 +602,9 @@ function _upload_form($node) {
*
* @ingroup themeable
*/
-function theme_upload_form_current($form) {
+function theme_upload_form_current($variables) {
+ $form = $variables['form'];
+
$header = array('', t('Delete'), t('List'), t('Description'), t('Weight'), t('Size'));
drupal_add_tabledrag('upload-attachments', 'order', 'sibling', 'upload-weight');
@@ -616,7 +620,7 @@ function theme_upload_form_current($form
$row[] = drupal_render($form[$key]['size']);
$rows[] = array('data' => $row, 'class' => array('draggable'));
}
- $output = theme('table', $header, $rows, array('id' => 'upload-attachments'));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'upload-attachments')));
$output .= drupal_render_children($form);
return $output;
}
@@ -627,9 +631,9 @@ function theme_upload_form_current($form
*
* @ingroup themeable
*/
-function theme_upload_form_new($form) {
+function theme_upload_form_new($variables) {
drupal_add_tabledrag('upload-attachments', 'order', 'sibling', 'upload-weight');
- $output = drupal_render_children($form);
+ $output = drupal_render_children($variables['form']);
return $output;
}
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.81
diff -u -p -r1.81 user.admin.inc
--- modules/user/user.admin.inc 2 Oct 2009 14:49:10 -0000 1.81
+++ modules/user/user.admin.inc 8 Oct 2009 16:11:57 -0000
@@ -180,7 +180,7 @@ function user_admin_account() {
$accounts = array();
foreach ($result as $account) {
$accounts[$account->uid] = '';
- $form['name'][$account->uid] = array('#markup' => theme('username', $account));
+ $form['name'][$account->uid] = array('#markup' => theme('username', array('account' => $account)));
$form['status'][$account->uid] = array('#markup' => $status[$account->status]);
$users_roles = array();
$roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = :uid', array(':uid' => $account->uid));
@@ -188,7 +188,7 @@ function user_admin_account() {
$users_roles[] = $roles[$user_role->rid];
}
asort($users_roles);
- $form['roles'][$account->uid][0] = array('#markup' => theme('item_list', $users_roles));
+ $form['roles'][$account->uid][0] = array('#markup' => theme('item_list', array('items' => $users_roles)));
$form['member_for'][$account->uid] = array('#markup' => format_interval(REQUEST_TIME - $account->created));
$form['last_access'][$account->uid] = array('#markup' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'));
$form['operations'][$account->uid] = array('#markup' => l(t('edit'), "user/$account->uid/edit", array('query' => $destination)));
@@ -197,7 +197,7 @@ function user_admin_account() {
'#type' => 'checkboxes',
'#options' => $accounts
);
- $form['pager'] = array('#markup' => theme('pager', NULL));
+ $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL)));
return $form;
}
@@ -677,7 +677,9 @@ function user_admin_permissions_submit($
*
* @ingroup themeable
*/
-function theme_user_admin_permissions($form) {
+function theme_user_admin_permissions($variables) {
+ $form = $variables['form'];
+
$roles = user_roles();
foreach (element_children($form['permission']) as $key) {
$row = array();
@@ -702,7 +704,7 @@ function theme_user_admin_permissions($f
$header[] = array('data' => drupal_render($form['role_names'][$rid]), 'class' => array('checkbox'));
}
$output = theme('system_compact_link');
- $output .= theme('table', $header, $rows, array('id' => 'permissions'));
+ $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'permissions')));
$output .= drupal_render_children($form);
return $output;
}
@@ -765,7 +767,7 @@ function user_admin_role_validate($form,
if ($form_state['values']['name']) {
if ($form_state['values']['op'] == t('Save role')) {
$role = user_role_load($form_state['values']['name']);
- if ($role && $role->rid != $form_state['values']['rid']) {
+ if ($role && $role->rid != $form_state['values']['rid']) {
form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
}
}
@@ -803,7 +805,9 @@ function user_admin_role_submit($form, &
*
* @ingroup themeable
*/
-function theme_user_admin_account($form) {
+function theme_user_admin_account($variables) {
+ $form = $variables['form'];
+
// Overview table:
$header = array(
theme('table_select_header_cell'),
@@ -833,7 +837,7 @@ function theme_user_admin_account($form)
$rows[] = array(array('data' => t('No users available.'), 'colspan' => '7'));
}
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
if ($form['pager']['#markup']) {
$output .= drupal_render($form['pager']);
}
@@ -848,7 +852,9 @@ function theme_user_admin_account($form)
*
* @ingroup themeable
*/
-function theme_user_admin_new_role($form) {
+function theme_user_admin_new_role($variables) {
+ $form = $variables['form'];
+
$header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2));
foreach (user_roles() as $rid => $name) {
$edit_permissions = l(t('edit permissions'), 'admin/config/people/permissions/' . $rid);
@@ -862,7 +868,7 @@ function theme_user_admin_new_role($form
$rows[] = array(drupal_render($form['name']), array('data' => drupal_render($form['submit']), 'colspan' => 2));
$output = drupal_render_children($form);
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
return $output;
}
@@ -872,7 +878,9 @@ function theme_user_admin_new_role($form
*
* @ingroup themeable
*/
-function theme_user_filter_form($form) {
+function theme_user_filter_form($variables) {
+ $form = $variables['form'];
+
$output = '
\n";
@@ -361,7 +364,7 @@ function node_preview($node) {
if (!form_get_errors()) {
$cloned_node = clone $node;
$cloned_node->in_preview = TRUE;
- $output = theme('node_preview', $cloned_node);
+ $output = theme('node_preview', array('node' => $cloned_node));
}
drupal_set_title(t('Preview'), PASS_THROUGH);
@@ -372,12 +375,15 @@ function node_preview($node) {
/**
* Display a node preview for display during node creation and editing.
*
- * @param $node
- * The node object which is being previewed.
+ * @param $variables
+ * An associative array containing:
+ * - node: The node object which is being previewed.
*
* @ingroup themeable
*/
-function theme_node_preview($node) {
+function theme_node_preview($variables) {
+ $node = $variables['node'];
+
$output = '
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.208
diff -u -p -r1.208 system.admin.inc
--- modules/system/system.admin.inc 6 Oct 2009 01:38:55 -0000 1.208
+++ modules/system/system.admin.inc 8 Oct 2009 16:11:56 -0000
@@ -56,7 +56,7 @@ function system_main_admin_page($arg = N
}
else {
// Theme items below.
- $block['content'] .= theme('admin_block_content', $content);
+ $block['content'] .= theme('admin_block_content', array('content' => $content));
}
}
// Prepare for sorting as in function _menu_tree_check_access().
@@ -66,7 +66,7 @@ function system_main_admin_page($arg = N
}
if ($blocks) {
ksort($blocks);
- return theme('admin_page', $blocks);
+ return theme('admin_page', array('blocks' => $blocks));
}
else {
return t('You do not have any administrative items.');
@@ -105,7 +105,7 @@ function system_admin_config_page() {
$function = $item['block_callback'];
$block['content'] .= $function();
}
- $block['content'] .= theme('admin_block_content', system_admin_menu_block($item));
+ $block['content'] .= theme('admin_block_content', array('content' => system_admin_menu_block($item)));
// Prepare for sorting as in function _menu_tree_check_access().
// The weight is offset so it is always positive, with a uniform 5-digits.
$blocks[(50000 + $item['weight']) . ' ' . $item['title'] . ' ' . $item['mlid']] = $block;
@@ -113,7 +113,7 @@ function system_admin_config_page() {
}
if ($blocks) {
ksort($blocks);
- return theme('admin_page', $blocks);
+ return theme('admin_page', array('blocks' => $blocks));
}
else {
return t('You do not have any administrative items.');
@@ -133,7 +133,7 @@ function system_admin_config_page() {
function system_admin_menu_block_page() {
$item = menu_get_item();
if ($content = system_admin_menu_block($item)) {
- $output = theme('admin_block_content', $content);
+ $output = theme('admin_block_content', array('content' => $content));
}
else {
$output = t('You do not have any administrative items.');
@@ -172,7 +172,7 @@ function system_admin_by_module() {
$menu_items[$file->info['name']] = array($file->info['description'], $admin_tasks);
}
}
- return theme('system_admin_by_module', $menu_items);
+ return theme('system_admin_by_module', array('menu_items' => $menu_items));
}
/**
@@ -187,7 +187,7 @@ function system_settings_overview() {
$item = menu_get_item('admin/config');
$content = system_admin_menu_block($item);
- $output = theme('admin_block_content', $content);
+ $output = theme('admin_block_content', array('content' => $content));
return $output;
}
@@ -232,7 +232,7 @@ function system_themes_form() {
break;
}
}
- $screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $theme->info['name'])), '', array('class' => array('screenshot')), FALSE) : t('no screenshot');
+ $screenshot = $screenshot ? theme('image', array('path' => $screenshot, 'alt' => t('Screenshot for %theme theme', array('%theme' => $theme->info['name'])), 'title' => '', 'attributes' => array('class' => array('screenshot')), 'getsize' => FALSE)) : t('no screenshot');
$form[$theme->name]['screenshot'] = array('#markup' => $screenshot);
$form[$theme->name]['info'] = array(
@@ -699,7 +699,7 @@ function system_modules($form, $form_sta
if ($help_arg && $module->status && in_array($filename, module_implements('help'))) {
if (module_invoke($filename, 'help', "admin/help#$filename", $help_arg)) {
// Module has a help page.
- $extra['help'] = theme('more_help_link', url("admin/help/$filename"));
+ $extra['help'] = theme('more_help_link', array('url' => url("admin/help/$filename")));
}
}
// Mark dependents disabled so the user cannot remove required modules.
@@ -816,9 +816,9 @@ function _system_modules_build_row($info
}
else {
$form['enable'] = array(
- '#markup' => theme('image', 'misc/watchdog-error.png', t('incompatible'), $status_short),
+ '#markup' => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('incompatible'), 'title' => $status_short)),
);
- $form['description']['#markup'] .= theme('system_modules_incompatible', $status_long);
+ $form['description']['#markup'] .= theme('system_modules_incompatible', array('message' => $status_long));
}
// Show a "more help" link for modules that have them.
@@ -854,7 +854,7 @@ function system_modules_confirm_form($mo
);
$items[] = format_plural(count($info['requires']), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', $t_argument);
}
- $form['text'] = array('#markup' => theme('item_list', $items));
+ $form['text'] = array('#markup' => theme('item_list', array('items' => $items)));
if ($form) {
// Set some default form values
@@ -1113,7 +1113,7 @@ function system_modules_uninstall_confir
if (isset($uninstall)) {
$form['#confirmed'] = TRUE;
$form['uninstall']['#tree'] = TRUE;
- $form['modules'] = array('#markup' => '';
$preview_trimmed_version = FALSE;
@@ -504,13 +510,13 @@ function node_revision_overview($node) {
$operations = array();
if ($revision->current_vid > 0) {
- $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', $revision)))
+ $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision))))
. (($revision->log != '') ? '
' . filter_xss($revision->log) . '
' : ''), 'class' => array('revision-current')); - $operations[] = array('data' => theme('placeholder', t('current revision')), 'class' => array('revision-current'), 'colspan' => 2); + $operations[] = array('data' => theme('placeholder', array('text' => t('current revision'))), 'class' => array('revision-current'), 'colspan' => 2); } else { - $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', $revision))) + $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision)))) . (($revision->log != '') ? '' . filter_xss($revision->log) . '
' : ''); if ($revert_permission) { $operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert"); Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.61 diff -u -p -r1.61 openid.module --- modules/openid/openid.module 22 Sep 2009 07:50:16 -0000 1.61 +++ modules/openid/openid.module 8 Oct 2009 16:11:56 -0000 @@ -107,7 +107,7 @@ function _openid_user_login_form_alter(& ); $form['openid_links'] = array( - '#markup' => theme('item_list', $items), + '#markup' => theme('item_list', array('items' => $items)), '#weight' => 1, ); Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.315 diff -u -p -r1.315 poll.module --- modules/poll/poll.module 2 Oct 2009 00:04:20 -0000 1.315 +++ modules/poll/poll.module 8 Oct 2009 16:11:56 -0000 @@ -744,11 +744,11 @@ function poll_view_results($node, $build foreach ($node->choice as $i => $choice) { if (!empty($choice['chtext'])) { $chvotes = isset($choice['chvotes']) ? $choice['chvotes'] : NULL; - $poll_results .= theme('poll_bar', $choice['chtext'], $chvotes, $total_votes, isset($node->vote) && $node->vote == $i, $block); + $poll_results .= theme('poll_bar', array('title' => $choice['chtext'], 'votes' => $chvotes, 'total_votes' => $total_votes, 'vote' => isset($node->vote) && $node->vote == $i, 'block' => $block)); } } - return theme('poll_results', $node->title, $poll_results, $total_votes, isset($node->links) ? $node->links : array(), $block, $node->nid, isset($node->vote) ? $node->vote : NULL); + return theme('poll_results', array('raw_title' => $node->title, 'results' => $poll_results, 'votes' => $total_votes, 'raw_links' => isset($node->links) ? $node->links : array(), 'block' => $block, 'nid' => $node->nid, 'vote' => isset($node->vote) ? $node->vote : NULL)); } @@ -757,7 +757,9 @@ function poll_view_results($node, $build * * @ingroup themeable */ -function theme_poll_choices($form) { +function theme_poll_choices($variables) { + $form = $variables['form']; + drupal_add_tabledrag('poll-choice-table', 'order', 'sibling', 'poll-weight'); $delta = 0; @@ -793,7 +795,7 @@ function theme_poll_choices($form) { $rows[] = $row; } - $output = theme('table', $headers, $rows, array('id' => 'poll-choice-table')); + $output = theme('table', array('header' => $headers, 'rows' => $rows, 'attributes' => array('id' => 'poll-choice-table'))); $output .= drupal_render_children($form); return $output; } @@ -812,7 +814,7 @@ function theme_poll_choices($form) { * @see theme_poll_results() */ function template_preprocess_poll_results(&$variables) { - $variables['links'] = theme('links', $variables['raw_links']); + $variables['links'] = theme('links', array('links' => $variables['raw_links'])); if (isset($variables['vote']) && $variables['vote'] > -1 && user_access('cancel own vote')) { $variables['cancel_form'] = drupal_render(drupal_get_form('poll_cancel_form', $variables['nid'])); } Index: modules/poll/poll.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v retrieving revision 1.20 diff -u -p -r1.20 poll.pages.inc --- modules/poll/poll.pages.inc 29 Jul 2009 06:39:34 -0000 1.20 +++ modules/poll/poll.pages.inc 8 Oct 2009 16:11:56 -0000 @@ -42,7 +42,7 @@ function poll_page() { $output .= '' . $title . '
' . $content . '
';
+function theme_search_results_listing($variables) {
+ $output = '' . $variables['title'] . '
' . $variables['content'] . '
';
return $output;
}
@@ -73,9 +74,9 @@ function theme_search_results_listing($t
function template_preprocess_search_results(&$variables) {
$variables['search_results'] = '';
foreach ($variables['results'] as $result) {
- $variables['search_results'] .= theme('search_result', $result, $variables['type']);
+ $variables['search_results'] .= theme('search_result', array('result' => $result, 'type' => $variables['type']));
}
- $variables['pager'] = theme('pager', NULL);
+ $variables['pager'] = theme('pager', array('tags' => NULL));
// Provide alternate search results template.
$variables['template_files'][] = 'search-results-' . $variables['type'];
}
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.76
diff -u -p -r1.76 simpletest.module
--- modules/simpletest/simpletest.module 8 Oct 2009 15:18:27 -0000 1.76
+++ modules/simpletest/simpletest.module 8 Oct 2009 16:11:56 -0000
@@ -209,7 +209,7 @@ function _simpletest_batch_operation($te
}
$context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
$context['message'] .= 'Overall results: ' . _simpletest_format_summary_line($test_results) . '
';
- $context['message'] .= theme('item_list', $items);
+ $context['message'] .= theme('item_list', array('items' => $items));
// Save working values for the next iteration.
$context['sandbox']['tests'] = $test_list;
Index: modules/simpletest/simpletest.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v
retrieving revision 1.17
diff -u -p -r1.17 simpletest.pages.inc
--- modules/simpletest/simpletest.pages.inc 18 Sep 2009 00:12:47 -0000 1.17
+++ modules/simpletest/simpletest.pages.inc 8 Oct 2009 16:11:56 -0000
@@ -60,10 +60,16 @@ function simpletest_test_form($form) {
/**
* Theme the test list generated by simpletest_test_form() into a table.
*
- * @param $table Form array that represent a table.
- * @return HTML output.
+ * @param $variables
+ * An associative array containing:
+ * - table: Form array that represent a table.
+ *
+ * @return
+ * HTML output.
*/
-function theme_simpletest_test_table($table) {
+function theme_simpletest_test_table($variables) {
+ $table = $variables['table'];
+
drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css');
drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js');
@@ -77,8 +83,8 @@ function theme_simpletest_test_table($ta
// Define the images used to expand/collapse the test groups.
$js = array(
'images' => array(
- theme('image', 'misc/menu-collapsed.png', 'Expand', 'Expand'),
- theme('image', 'misc/menu-expanded.png', 'Collapsed', 'Collapsed'),
+ theme('image', array('path' => 'misc/menu-collapsed.png', 'alt' => 'Expand', 'title' => 'Expand')),
+ theme('image', array('path' => 'misc/menu-expanded.png', 'alt' => 'Collapsed', 'title' => 'Collapsed')),
),
);
@@ -140,7 +146,7 @@ function theme_simpletest_test_table($ta
$test['#name'] = $test_name;
$row[] = drupal_render($test);
- $row[] = theme('indentation', 1) . '';
+ $row[] = theme('indentation', array('size' => 1)) . '';
$row[] = '' . $description . '
';
$rows[] = array('data' => $row, 'class' => array($test_class . '-test', ($collapsed ? 'js-hide' : '')));
@@ -156,7 +162,7 @@ function theme_simpletest_test_table($ta
return '' . t('No tests to display.') . '';
}
else {
- return theme('table', $header, $rows, array('id' => 'simpletest-form-table'));
+ return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'simpletest-form-table')));
}
}
@@ -358,7 +364,8 @@ function simpletest_result_form_submit($
*
* @return HTML output.
*/
-function theme_simpletest_result_summary($form) {
+function theme_simpletest_result_summary($variables) {
+ $form = $variables['form'];
return '' . _simpletest_format_summary_line($form) . '
';
}
@@ -398,10 +405,10 @@ function simpletest_result_status_image(
if (!isset($map)) {
$map = array(
- 'pass' => theme('image', 'misc/watchdog-ok.png', t('Pass')),
- 'fail' => theme('image', 'misc/watchdog-error.png', t('Fail')),
- 'exception' => theme('image', 'misc/watchdog-warning.png', t('Exception')),
- 'debug' => theme('image', 'misc/watchdog-warning.png', t('Debug')),
+ 'pass' => theme('image', array('path' => 'misc/watchdog-ok.png', 'alt' => t('Pass'))),
+ 'fail' => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('Fail'))),
+ 'exception' => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('Exception'))),
+ 'debug' => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('Debug'))),
);
}
if (isset($map[$status])) {
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 8 Oct 2009 16:11:56 -0000
@@ -84,8 +84,8 @@ function common_test_theme() {
/**
* Theme function for testing drupal_render() theming.
*/
-function theme_common_test_foo($foo, $bar) {
- return $foo . $bar;
+function theme_common_test_foo($variables) {
+ return $variables['foo'] . $variables['bar'];
}
/**
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.27
diff -u -p -r1.27 field_test.module
--- modules/simpletest/tests/field_test.module 29 Sep 2009 15:13:56 -0000 1.27
+++ modules/simpletest/tests/field_test.module 8 Oct 2009 16:11:56 -0000
@@ -570,7 +570,9 @@ 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) {
+ $element = $variables['element'];
+
$value = $element['#item']['value'];
$settings = $element['#settings'];
@@ -580,7 +582,9 @@ 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) {
+ $element = $variables['element'];
+
$settings = $element['#settings'];
$items = array();
Index: modules/simpletest/tests/theme.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/theme.test,v
retrieving revision 1.6
diff -u -p -r1.6 theme.test
--- modules/simpletest/tests/theme.test 15 Sep 2009 17:10:39 -0000 1.6
+++ modules/simpletest/tests/theme.test 8 Oct 2009 16:11:56 -0000
@@ -70,7 +70,7 @@ class ThemeTableUnitTest extends DrupalW
function testThemeTableStickyHeaders() {
$header = array('one', 'two', 'three');
$rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
- $this->content = theme('table', $header, $rows);
+ $this->content = theme('table', array('header' => $header, 'rows' => $rows));
$js = drupal_add_js();
$this->assertTrue(isset($js['misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.'));
$this->assertRaw('sticky-enabled', t('Table has a class of sticky-enabled when $sticky = TRUE.'));
@@ -86,7 +86,7 @@ class ThemeTableUnitTest extends DrupalW
$attributes = array();
$caption = NULL;
$colgroups = array();
- $this->content = theme('table', $header, $rows, $attributes, $caption, $colgroups, FALSE);
+ $this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => FALSE));
$js = drupal_add_js();
$this->assertFalse(isset($js['misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.'));
$this->assertNoRaw('sticky-enabled', t('Table does not have a class of sticky-enabled because $sticky = FALSE.'));
Index: modules/statistics/statistics.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v
retrieving revision 1.33
diff -u -p -r1.33 statistics.admin.inc
--- modules/statistics/statistics.admin.inc 29 Sep 2009 15:31:16 -0000 1.33
+++ modules/statistics/statistics.admin.inc 8 Oct 2009 16:11:56 -0000
@@ -31,7 +31,7 @@ function statistics_recent_hits() {
$rows[] = array(
array('data' => format_date($log->timestamp, 'short'), 'class' => array('nowrap')),
_statistics_format_item($log->title, $log->path),
- theme('username', $log),
+ theme('username', array('account' => $log)),
l(t('details'), "admin/reports/access/$log->aid"));
}
@@ -133,7 +133,7 @@ function statistics_top_visitors() {
$destination = drupal_get_destination();
foreach ($result as $account) {
$ban_link = $account->iid ? l(t('unblock IP address'), "admin/config/people/ip-blocking/delete/$account->iid", array('query' => $destination)) : l(t('block IP address'), "admin/config/people/ip-blocking/$account->hostname", array('query' => $destination));
- $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : '');
+ $rows[] = array($account->hits, ($account->uid ? theme('username', array('account' => $account)) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : '');
}
if (empty($rows)) {
@@ -225,7 +225,7 @@ function statistics_access_log($aid) {
);
$rows[] = array(
array('data' => t('User'), 'header' => TRUE),
- theme('username', $access)
+ theme('username', array('account' => $access))
);
$rows[] = array(
array('data' => t('Hostname'), 'header' => TRUE),
Index: modules/statistics/statistics.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.pages.inc,v
retrieving revision 1.16
diff -u -p -r1.16 statistics.pages.inc
--- modules/statistics/statistics.pages.inc 25 Aug 2009 10:27:15 -0000 1.16
+++ modules/statistics/statistics.pages.inc 8 Oct 2009 16:11:56 -0000
@@ -33,7 +33,7 @@ function statistics_node_tracker() {
$rows[] = array(
array('data' => format_date($log->timestamp, 'short'), 'class' => array('nowrap')),
_statistics_link($log->url),
- theme('username', $log),
+ theme('username', array('account' => $log)),
l(t('details'), "admin/reports/access/$log->aid"),
);
}
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 8 Oct 2009 16:11:56 -0000
@@ -77,7 +77,7 @@ function syslog_watchdog(array $log_entr
openlog('drupal', LOG_NDELAY, variable_get('syslog_facility', $default_facility));
}
- syslog($log_entry['severity'], theme('syslog_format', $log_entry));
+ syslog($log_entry['severity'], theme('syslog_format', array('entry' => $log_entry)));
}
function syslog_theme() {
@@ -93,7 +93,8 @@ function syslog_theme() {
*
* @ingroup themeable
*/
-function theme_syslog_format($entry) {
+function theme_syslog_format($variables) {
+ $entry = $variables['entry'];
global $base_url;
$message = $base_url;
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.35
diff -u -p -r1.35 page.tpl.php
--- modules/system/page.tpl.php 5 Oct 2009 02:43:01 -0000 1.35
+++ modules/system/page.tpl.php 8 Oct 2009 16:11:56 -0000
@@ -92,7 +92,7 @@
@@ -129,7 +129,7 @@
' . t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') . '
' . theme('item_list', $uninstall)); + $form['modules'] = array('#markup' => '' . t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') . '
' . theme('item_list', array('items' => $uninstall))); $form = confirm_form( $form, t('Confirm uninstall'), @@ -1900,7 +1900,7 @@ function system_status($check = FALSE) { ->condition('pass', '') ->condition('status', 0) ->execute(); - return theme('status_report', $requirements); + return theme('status_report', array('requirements' => $requirements)); } /** @@ -1953,12 +1953,16 @@ function system_batch_page() { /** * This function formats an administrative block for display. * - * @param $block - * An array containing information about the block. It should - * include a 'title', a 'description' and a formatted 'content'. + * @param $variables + * An associative array containing: + * - block: An array containing information about the block. It should + * include a 'title', a 'description' and a formatted 'content'. + * * @ingroup themeable */ -function theme_admin_block($block) { +function theme_admin_block($variables) { + $block = $variables['block']; + // Don't display the block if it has no content to display. if (empty($block['show'])) { return ''; @@ -1994,12 +1998,16 @@ EOT; /** * This function formats the content of an administrative block. * - * @param $content - * An array containing information about the block. It should - * include a 'title', a 'description' and a formatted 'content'. + * @param $variables + * An associative array containing: + * - content: An array containing information about the block. It should + * include a 'title', a 'description' and a formatted 'content'. + * * @ingroup themeable */ -function theme_admin_block_content($content) { +function theme_admin_block_content($variables) { + $content = $variables['content']; + if (!$content) { return ''; } @@ -2025,19 +2033,23 @@ function theme_admin_block_content($cont /** * This function formats an administrative page for viewing. * - * @param $blocks - * An array of blocks to display. Each array should include a - * 'title', a 'description', a formatted 'content' and a - * 'position' which will control which container it will be - * in. This is usually 'left' or 'right'. + * @param $variables + * An associative array containing: + * - blocks: An array of blocks to display. Each array should include a + * 'title', a 'description', a formatted 'content' and a + * 'position' which will control which container it will be + * in. This is usually 'left' or 'right'. + * * @ingroup themeable */ -function theme_admin_page($blocks) { +function theme_admin_page($variables) { + $blocks = $variables['blocks']; + $stripe = 0; $container = array(); foreach ($blocks as $block) { - if ($block_output = theme('admin_block', $block)) { + if ($block_output = theme('admin_block', array('block' => $block))) { if (empty($block['position'])) { // perform automatic striping. $block['position'] = ++$stripe % 2 ? 'left' : 'right'; @@ -2064,11 +2076,15 @@ function theme_admin_page($blocks) { /** * Theme output of the dashboard page. * - * @param $menu_items - * An array of modules to be displayed. + * @param $variables + * An associative array containing: + * - menu_items: An array of modules to be displayed. + * * @ingroup themeable */ -function theme_system_admin_by_module($menu_items) { +function theme_system_admin_by_module($variables) { + $menu_items = $variables['menu_items']; + $stripe = 0; $output = ''; $container = array('left' => '', 'right' => ''); @@ -2083,11 +2099,11 @@ function theme_system_admin_by_module($m if (count($items)) { $block = array(); $block['title'] = $module; - $block['content'] = theme('item_list', $items); + $block['content'] = theme('item_list', array('items' => $items)); $block['description'] = t($description); $block['show'] = TRUE; - if ($block_output = theme('admin_block', $block)) { + if ($block_output = theme('admin_block', array('block' => $block))) { if (!isset($block['position'])) { // Perform automatic striping. $block['position'] = $position; @@ -2112,11 +2128,15 @@ function theme_system_admin_by_module($m /** * Theme requirements status report. * - * @param $requirements - * An array of requirements. + * @param $variables + * An associative array containing: + * - requirements: An array of requirements. + * * @ingroup themeable */ -function theme_status_report($requirements) { +function theme_status_report($variables) { + $requirements = $variables['requirements']; + $i = 0; $output = '';
$output .= drupal_render($form['filters']);
$output .= '
';
@@ -885,7 +893,9 @@ function theme_user_filter_form($form) {
*
* @ingroup themeable
*/
-function theme_user_filters($form) {
+function theme_user_filters($variables) {
+ $form = $variables['form'];
+
$output = '- ';
if (!empty($form['current'])) {
foreach (element_children($form['current']) as $key) {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1055
diff -u -p -r1.1055 user.module
--- modules/user/user.module 2 Oct 2009 14:49:10 -0000 1.1055
+++ modules/user/user.module 8 Oct 2009 16:11:57 -0000
@@ -840,7 +840,7 @@ function user_element_info() {
*/
function user_user_view($account) {
$account->content['user_picture'] = array(
- '#markup' => theme('user_picture', $account),
+ '#markup' => theme('user_picture', array('account' => $account)),
'#weight' => -10,
);
if (!isset($account->content['summary'])) {
@@ -958,7 +958,7 @@ function user_login_block($form) {
$items[] = l(t('Create new account'), 'user/register', array('attributes' => array('title' => t('Create a new user account.'))));
}
$items[] = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.'))));
- $form['links'] = array('#markup' => theme('item_list', $items));
+ $form['links'] = array('#markup' => theme('item_list', array('items' => $items)));
return $form;
}
@@ -1045,7 +1045,7 @@ function user_block_view($delta = '') {
if (user_access('access content')) {
// Retrieve a list of new users who have subsequently accessed the site successfully.
$items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
- $output = theme('user_list', $items);
+ $output = theme('user_list', array('users' => $items));
$block['subject'] = t('Who\'s new');
$block['content'] = $output;
@@ -1081,7 +1081,7 @@ function user_block_view($delta = '') {
$max_users = variable_get('user_block_max_list_count', 10);
if ($authenticated_count && $max_users) {
$items = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= :interval AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY max_timestamp DESC', 0, $max_users, array(':interval' => $interval))->fetchAll();
- $output .= theme('user_list', $items, t('Online users'));
+ $output .= theme('user_list', array('users' => $items, 'titles' => t('Online users')));
}
$block['subject'] = t('Who\'s online');
@@ -1125,10 +1125,10 @@ function template_preprocess_user_pictur
if (isset($filepath)) {
$alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
if (module_exists('image') && $style = variable_get('user_picture_style', '')) {
- $variables['user_picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE);
+ $variables['user_picture'] = theme('image_style', array('style_name' => $style, 'path' => $filepath, 'alt' => $alt, 'title' => $alt, 'attributes' => array(), 'getsize' => FALSE));
}
else {
- $variables['user_picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE);
+ $variables['user_picture'] = theme('image', array('path' => $filepath, 'alt' => $alt, 'title' => $alt, 'attributes' => array(), 'getsize' => FALSE));
}
if (!empty($account->uid) && user_access('access user profiles')) {
$attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
@@ -1141,20 +1141,24 @@ function template_preprocess_user_pictur
/**
* Make a list of users.
*
- * @param $users
- * An array with user objects. Should contain at least the name and uid.
- * @param $title
- * (optional) Title to pass on to theme_item_list().
+ * @param $variables
+ * An associative array containing:
+ * - users: An array with user objects. Should contain at least the name and
+ * uid.
+ * - title: (optional) Title to pass on to theme_item_list().
*
* @ingroup themeable
*/
-function theme_user_list($users, $title = NULL) {
+function theme_user_list($variables) {
+ $users = $variables['users'];
+ $title = $variables['title'];
+
if (!empty($users)) {
foreach ($users as $user) {
- $items[] = theme('username', $user);
+ $items[] = theme('username', array('account' => $user));
}
}
- return theme('item_list', $items, $title);
+ return theme('item_list', array('items' => $items, 'title' => $title));
}
function user_is_anonymous() {
@@ -1911,7 +1915,7 @@ function user_edit_form(&$form, &$form_s
'#value' => isset($account->picture) ? $account->picture : NULL,
);
$form['picture']['picture_current'] = array(
- '#markup' => theme('user_picture', $account),
+ '#markup' => theme('user_picture', array('account' => $account)),
);
$form['picture']['picture_delete'] = array(
'#type' => 'checkbox',
@@ -2838,8 +2842,10 @@ function user_comment_view($comment) {
*
* @ingroup themeable
*/
-function theme_user_signature($signature) {
+function theme_user_signature($variables) {
+ $signature = $variables['signature'];
$output = '';
+
if ($signature) {
$output .= '
';
$output .= '
—
';
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.32
diff -u -p -r1.32 template.php
--- themes/garland/template.php 5 Oct 2009 02:43:01 -0000 1.32
+++ themes/garland/template.php 8 Oct 2009 16:11:57 -0000
@@ -8,7 +8,9 @@
* An array containing the breadcrumb links.
* @return a string containing the breadcrumb output.
*/
-function garland_breadcrumb($breadcrumb) {
+function garland_breadcrumb($variables) {
+ $breadcrumb = $variables['breadcrumb'];
+
if (!empty($breadcrumb)) {
// Provide a navigational heading to give context for breadcrumb links to
// screen-reader users. Make the heading invisible with .element-invisible.
@@ -36,31 +38,33 @@ function garland_process_html(&$vars) {
function garland_preprocess_page(&$vars) {
$vars['tabs2'] = menu_secondary_local_tasks();
if (isset($vars['main_menu'])) {
- $vars['primary_nav'] = theme('links', $vars['main_menu'],
- array(
+ $vars['primary_nav'] = theme('links', array(
+ 'links' => $vars['main_menu'],
+ 'attributes' => array(
'class' => array('links', 'main-menu'),
),
- array(
+ 'heading' => array(
'text' => t('Main menu'),
'level' => 'h2',
'class' => array('element-invisible'),
)
- );
+ ));
}
else {
$vars['primary_nav'] = FALSE;
}
if (isset($vars['secondary_menu'])) {
- $vars['secondary_nav'] = theme('links', $vars['secondary_menu'],
- array(
+ $vars['secondary_nav'] = theme('links', array(
+ 'links' => $vars['secondary_menu'],
+ 'attributes' => array(
'class' => array('links', 'secondary-menu'),
),
- array(
+ 'heading' => array(
'text' => t('Secondary menu'),
'level' => 'h2',
'class' => array('element-invisible'),
)
- );
+ ));
}
else {
$vars['secondary_nav'] = FALSE;
Index: themes/seven/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/template.php,v
retrieving revision 1.6
diff -u -p -r1.6 template.php
--- themes/seven/template.php 15 Sep 2009 17:10:39 -0000 1.6
+++ themes/seven/template.php 8 Oct 2009 16:11:57 -0000
@@ -15,7 +15,8 @@ function seven_preprocess_page(&$vars) {
/**
* Display the list of available node types for node creation.
*/
-function seven_node_add_list($content) {
+function seven_node_add_list($variables) {
+ $content = $variables['content'];
$output = '';
if ($content) {
$output = '- ';
@@ -35,7 +36,8 @@ function seven_node_add_list($content) {
*
* Use unordered list markup in both compact and extended move.
*/
-function seven_admin_block_content($content) {
+function seven_admin_block_content($variables) {
+ $content = $variables['content'];
$output = '';
if (!empty($content)) {
$output = system_admin_compact_mode() ? '
- ' : '
- ';
@@ -57,13 +59,14 @@ function seven_admin_block_content($cont
*
* Use our own image versions, so they show up as black and not gray on gray.
*/
-function seven_tablesort_indicator($style) {
+function seven_tablesort_indicator($variables) {
+ $style = $variables['style'];
$theme_path = drupal_get_path('theme', 'seven');
if ($style == "asc") {
- return theme('image', $theme_path . '/images/arrow-asc.png', t('sort icon'), t('sort ascending'));
+ return theme('image', array('path' => $theme_path . '/images/arrow-asc.png', 'alt' => t('sort icon'), 'title' => t('sort ascending')));
}
else {
- return theme('image', $theme_path . '/images/arrow-desc.png', t('sort icon'), t('sort descending'));
+ return theme('image', array('path' => $theme_path . '/images/arrow-desc.png', 'alt' => t('sort icon'), 'title' => t('sort descending')));
}
}
@@ -72,7 +75,8 @@ function seven_tablesort_indicator($styl
*
* Add span to legend tag, so we can style it to be inside the fieldset.
*/
-function seven_fieldset($element) {
+function seven_fieldset($variables) {
+ $element = $variables['element'];
if (!empty($element['#collapsible'])) {
drupal_add_js('misc/collapse.js');