diff --git a/includes/batch.inc b/includes/batch.inc
index 095b9e78b9f6568081220eccd2952928b131c86e..c0833208fbee8be9af4d1eac0ed7f26b76b6b0bc 100644
--- a/includes/batch.inc
+++ b/includes/batch.inc
@@ -170,7 +170,7 @@ function _batch_progress_page_nojs() {
// the error message.
ob_start();
$fallback = $current_set['error_message'] . '<br />' . $batch['error_message'];
- $fallback = theme('maintenance_page', $fallback, FALSE);
+ $fallback = theme('maintenance_page', array('content' => $fallback, 'show_messages' => FALSE));
// We strip the end of the page using a marker in the template, so any
// additional HTML output by PHP shows up inside the page rather than below
@@ -192,7 +192,7 @@ function _batch_progress_page_nojs() {
$url = url($batch['url'], array('query' => array('id' => $batch['id'], 'op' => $new_op)));
drupal_add_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">');
- return theme('progress_bar', $percentage, $message);
+ return theme('progress_bar', array('percent' => $percentage, 'message' => $message));
}
/**
diff --git a/includes/common.inc b/includes/common.inc
index 450777f3d65a339e9051a3bb44d07556956c51da..74e437e8f8c5b16837acd132ff34909121ee9c28 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -320,7 +320,7 @@ function drupal_add_feed($url = NULL, $title = '') {
$stored_feed_links = &drupal_static(__FUNCTION__, array());
if (!is_null($url) && !isset($stored_feed_links[$url])) {
- $stored_feed_links[$url] = theme('feed_icon', $url, $title);
+ $stored_feed_links[$url] = theme('feed_icon', array('url' => $url, 'title' => $title));
drupal_add_link(array('rel' => 'alternate',
'type' => 'application/rss+xml',
@@ -650,8 +650,8 @@ function drupal_site_offline() {
drupal_maintenance_theme();
drupal_add_http_header('503 Service unavailable');
drupal_set_title(t('Site under maintenance'));
- print theme('maintenance_page', filter_xss_admin(variable_get('maintenance_mode_message',
- t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
+ print theme('maintenance_page', array('content' => filter_xss_admin(variable_get('maintenance_mode_message',
+ t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))))));
}
/**
@@ -1174,7 +1174,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
drupal_set_title(t('Error'));
// We fallback to a maintenance page at this point, because the page generation
// itself can generate errors.
- print theme('maintenance_page', t('The website encountered an unexpected error. Please try again later.'));
+ print theme('maintenance_page', array('content' => t('The website encountered an unexpected error. Please try again later.')));
exit;
}
}
@@ -1499,7 +1499,7 @@ function t($string, array $args = array(), array $options = array()) {
case '%':
default:
// Escaped and placeholder.
- $args[$key] = theme('placeholder', $value);
+ $args[$key] = theme('placeholder', array('text' => $value));
break;
case '!':
@@ -3683,7 +3683,7 @@ function drupal_get_library($module, $name) {
* themed into a table. The table must have an id attribute set. If using
* theme_table(), the id may be set as such:
* @code
- * $output = theme('table', $header, $rows, array('id' => 'my-module-table'));
+ * $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'my-module-table')));
* return $output;
* @endcode
*
@@ -4860,7 +4860,7 @@ function drupal_common_theme() {
'arguments' => array('region' => NULL),
),
'username' => array(
- 'arguments' => array('object' => NULL),
+ 'arguments' => array('account' => NULL),
),
'progress_bar' => array(
'arguments' => array('percent' => NULL, 'message' => NULL),
diff --git a/includes/file.inc b/includes/file.inc
index 0a69859ec4efd369f21ccc8808358e701766e4ea..7729544f172477cf4db19ad810b03bdb8c9f9334 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -1162,7 +1162,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE,
if (!empty($errors)) {
$message = t('The specified file %name could not be uploaded.', array('%name' => $file->filename));
if (count($errors) > 1) {
- $message .= theme('item_list', $errors);
+ $message .= theme('item_list', array('items' => $errors));
}
else {
$message .= ' ' . array_pop($errors);
diff --git a/includes/form.inc b/includes/form.inc
index 21813389db74d40f39d083f38cee409c753e205e..31e200b80c1d858dbdd80d15653496c6d964bea7 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1549,10 +1549,12 @@ function form_options_flatten($array, $reset = TRUE) {
/**
* Theme select form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #options, #description, #extra, #multiple,
- * #required, #name, #attributes, #size.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #options, #description, #extra,
+ * #multiple, #required, #name, #attributes, #size.
+ *
* @return
* A themed HTML string representing the form element.
*
@@ -1562,7 +1564,8 @@ function form_options_flatten($array, $reset = TRUE) {
* $options to an associative array in which the keys are group labels, and the
* values are associative arrays in the normal $options format.
*/
-function theme_select($element) {
+function theme_select($variables) {
+ $element = $variables['element'];
$select = '';
$size = $element['#size'] ? ' size="' . $element['#size'] . '"' : '';
_form_set_class($element, array('form-select'));
@@ -1667,16 +1670,19 @@ function form_get_options($element, $key) {
/**
* Theme a fieldset form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #attributes, #children, #collapsed, #collapsible,
- * #description, #id, #title, #value.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #attributes, #children, #collapsed, #collapsible,
+ * #description, #id, #title, #value.
+ *
* @return
* A themed HTML string representing the group of items.
*
* @ingroup themeable
*/
-function theme_fieldset($element) {
+function theme_fieldset($variables) {
+ $element = $variables['element'];
if (!empty($element['#collapsible'])) {
if (!isset($element['#attributes']['class'])) {
@@ -1696,16 +1702,19 @@ function theme_fieldset($element) {
/**
* Theme a radio button form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #required, #return_value, #value, #attributes, #title,
- * #description
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #required, #return_value, #value, #attributes, #title,
+ * #description
+ *
* @return
* A themed HTML string representing the form item group.
*
* @ingroup themeable
*/
-function theme_radio($element) {
+function theme_radio($variables) {
+ $element = $variables['element'];
_form_set_class($element, array('form-radio'));
$output = '<input type="radio" ';
$output .= 'id="' . $element['#id'] . '" ';
@@ -1723,16 +1732,19 @@ function theme_radio($element) {
/**
* Theme a set of radio button form elements.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #options, #description, #required,
- * #attributes, #children.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #options, #description, #required,
+ * #attributes, #children.
+ *
* @return
* A themed HTML string representing the radio button set.
*
* @ingroup themeable
*/
-function theme_radios($element) {
+function theme_radios($variables) {
+ $element = $variables['element'];
$class = 'form-radios';
if (!empty($element['#attributes']['class'])) {
$class .= ' ' . implode(' ', $element['#attributes']['class']);
@@ -1798,16 +1810,19 @@ function password_confirm_validate($element, &$element_state) {
/**
* Theme a date selection form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #options, #description, #required,
- * #attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #options, #description, #required,
+ * #attributes.
+ *
* @return
* A themed HTML string representing the date selection boxes.
*
* @ingroup themeable
*/
-function theme_date($element) {
+function theme_date($variables) {
+ $element = $variables['element'];
return '<div class="container-inline">' . drupal_render_children($element) . '</div>';
}
@@ -2007,15 +2022,18 @@ function form_process_text_format($element) {
/**
* Theme a text format form element.
*
- * @param element
- * An associative array containing the properties of the element.
- * Properties used: #children, #description
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #children, #description
+ *
* @return
* A string representing the form element.
*
* @ingroup themeable
*/
-function theme_text_format_wrapper($element) {
+function theme_text_format_wrapper($variables) {
+ $element = $variables['element'];
$output = '<div class="text-format-wrapper">' . "\n";
$output .= $element['#children'] . "\n";
@@ -2032,16 +2050,19 @@ function theme_text_format_wrapper($element) {
/**
* Theme a checkbox form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #return_value, #description, #required,
- * #attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #return_value, #description, #required,
+ * #attributes.
+ *
* @return
* A themed HTML string representing the checkbox.
*
* @ingroup themeable
*/
-function theme_checkbox($element) {
+function theme_checkbox($variables) {
+ $element = $variables['element'];
_form_set_class($element, array('form-checkbox'));
$checkbox = '<input ';
$checkbox .= 'type="checkbox" ';
@@ -2061,15 +2082,18 @@ function theme_checkbox($element) {
/**
* Theme a set of checkbox form elements.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #children, #attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #children, #attributes.
+ *
* @return
* A themed HTML string representing the checkbox set.
*
* @ingroup themeable
*/
-function theme_checkboxes($element) {
+function theme_checkboxes($variables) {
+ $element = $variables['element'];
$class = 'form-checkboxes';
if (!empty($element['#attributes']['class'])) {
$class .= ' ' . implode(' ', $element['#attributes']['class']);
@@ -2119,13 +2143,15 @@ function form_process_checkboxes($element) {
/**
* Format a table with radio buttons or checkboxes.
*
- * @param $element
- * An associative array containing the properties and children of the
- * tableselect element.
- * Each option in $element['#options'] can contain an array keyed by
- * '#attributes' which is added to the row's HTML attributes.
- * @see theme_table
- * Properties used: header, options, empty, js_select.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties and children of
+ * the tableselect element.
+ * Each option in $variables['element']['#options'] can contain an array
+ * keyed by '#attributes' which is added to the row's HTML attributes.
+ * @see theme_table
+ * Properties used: header, options, empty, js_select.
+ *
* @return
* A themed HTML string representing the table.
*
@@ -2145,7 +2171,8 @@ function form_process_checkboxes($element) {
* );
* @ingroup themeable
*/
-function theme_tableselect($element) {
+function theme_tableselect($variables) {
+ $element = $variables['element'];
$rows = array();
if (!empty($element['#options'])) {
// Generate a table row for each selectable item in #options.
@@ -2177,7 +2204,7 @@ function theme_tableselect($element) {
$header = $element['#header'];
$rows[] = array(array('data' => $element['#empty'], 'colspan' => count($header)));
}
- return theme('table', $header, $rows);
+ return theme('table', array('header' => $header, 'rows' => $rows));
}
/**
@@ -2375,16 +2402,21 @@ function form_process_vertical_tabs($element, &$form_state) {
/**
* Makes the element's children fieldsets be vertical tabs.
*
- * @param $element
- * An associative array containing the properties and children of the
- * fieldset.
- * Properties used: #children.
+ * @param $variables
+ * An associative array containing:
+ *
+ * - element
+ * An associative array containing the properties and children of the
+ * fieldset.
+ * Properties used: #children.
+ *
* @return
* A themed HTML string representing the form element.
*
* @ingroup themeable
*/
-function theme_vertical_tabs($element) {
+function theme_vertical_tabs($variables) {
+ $element = $variables['element'];
// Add required JavaScript and Stylesheet.
drupal_add_library('system', 'vertical-tabs');
@@ -2394,30 +2426,36 @@ function theme_vertical_tabs($element) {
/**
* Theme a submit button form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #attributes, #button_type, #name, #value.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #attributes, #button_type, #name, #value.
+ *
* @return
* A themed HTML string representing the form element.
*
* @ingroup themeable
*/
-function theme_submit($element) {
+function theme_submit($variables) {
+ $element = $variables['element'];
return theme('button', $element);
}
/**
* Theme a button form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #attributes, #button_type, #name, #value.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #attributes, #button_type, #name, #value.
+ *
* @return
* A themed HTML string representing the form element.
*
* @ingroup themeable
*/
-function theme_button($element) {
+function theme_button($variables) {
+ $element = $variables['element'];
$element['#attributes']['class'][] = 'form-' . $element['#button_type'];
return '<input type="submit" ' . (empty($element['#name']) ? '' : 'name="' . $element['#name'] . '" ') . 'id="' . $element['#id'] . '" value="' . check_plain($element['#value']) . '" ' . drupal_attributes($element['#attributes']) . " />\n";
@@ -2426,14 +2464,17 @@ function theme_button($element) {
/**
* Theme a image button form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #attributes, #button_type, #name, #value, #title, #src.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #attributes, #button_type, #name, #value, #title, #src.
+ *
* @return
* A themed HTML string representing the form element.
* @ingroup themeable
*/
-function theme_image_button($element) {
+function theme_image_button($variables) {
+ $element = $variables['element'];
$element['#attributes']['class'][] = 'form-' . $element['#button_type'];
return '<input type="image" name="' . $element['#name'] . '" ' .
@@ -2448,31 +2489,37 @@ function theme_image_button($element) {
/**
* Theme a hidden form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #name, #value, #attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #name, #value, #attributes.
+ *
* @return
* A themed HTML string representing the form element.
*
* @ingroup themeable
*/
-function theme_hidden($element) {
+function theme_hidden($variables) {
+ $element = $variables['element'];
return '<input type="hidden" name="' . $element['#name'] . '" id="' . $element['#id'] . '" value="' . check_plain($element['#value']) . "\" " . drupal_attributes($element['#attributes']) . " />\n";
}
/**
* Theme a textfield form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #description, #size, #maxlength,
- * #required, #attributes, #autocomplete_path.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #description, #size, #maxlength,
+ * #required, #attributes, #autocomplete_path.
+ *
* @return
* A themed HTML string representing the textfield.
*
* @ingroup themeable
*/
-function theme_textfield($element) {
+function theme_textfield($variables) {
+ $element = $variables['element'];
$size = empty($element['#size']) ? '' : ' size="' . $element['#size'] . '"';
$maxlength = empty($element['#maxlength']) ? '' : ' maxlength="' . $element['#maxlength'] . '"';
$class = array('form-text');
@@ -2501,15 +2548,18 @@ function theme_textfield($element) {
/**
* Theme a form.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #action, #method, #attributes, #children
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #action, #method, #attributes, #children
+ *
* @return
* A themed HTML string representing the form.
*
* @ingroup themeable
*/
-function theme_form($element) {
+function theme_form($variables) {
+ $element = $variables['element'];
// Anonymous div to satisfy XHTML compliance.
$action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : '';
return '<form ' . $action . ' accept-charset="UTF-8" method="' . $element['#method'] . '" id="' . $element['#id'] . '"' . drupal_attributes($element['#attributes']) . ">\n<div>" . $element['#children'] . "\n</div></form>\n";
@@ -2518,16 +2568,19 @@ function theme_form($element) {
/**
* Theme a textarea form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #description, #rows, #cols, #required,
- * #attributes
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #description, #rows, #cols, #required,
+ * #attributes
+ *
* @return
* A themed HTML string representing the textarea.
*
* @ingroup themeable
*/
-function theme_textarea($element) {
+function theme_textarea($variables) {
+ $element = $variables['element'];
$class = array('form-textarea');
// Add resizable behavior
@@ -2543,32 +2596,37 @@ function theme_textarea($element) {
/**
* Theme HTML markup for use in forms.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #markup, #children.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #markup, #children.
+ *
* @return
* A themed HTML string representing the HTML markup.
*
* @ingroup themeable
*/
-
-function theme_markup($element) {
+function theme_markup($variables) {
+ $element = $variables['element'];
return (!empty($element['#markup']) ? $element['#markup'] : '') . drupal_render_children($element);
}
/**
* Theme a password form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #value, #description, #size, #maxlength,
- * #required, #attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #value, #description, #size, #maxlength,
+ * #required, #attributes.
+ *
* @return
- * A themed HTML string representing the form.
+ * A themed HTML string representing the form element.
*
* @ingroup themeable
*/
-function theme_password($element) {
+function theme_password($variables) {
+ $element = $variables['element'];
$size = $element['#size'] ? ' size="' . $element['#size'] . '" ' : '';
$maxlength = $element['#maxlength'] ? ' maxlength="' . $element['#maxlength'] . '" ' : '';
@@ -2594,9 +2652,12 @@ function form_process_weight($element) {
/**
* Theme a file upload form element.
*
- * @param $element
- * An associative array containing the properties of the element.
- * Properties used: #title, #name, #size, #description, #required, $attributes.
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #name, #size, #description, #required,
+ * #attributes.
+ *
* @return
* A themed HTML string representing the field.
*
@@ -2605,7 +2666,8 @@ function form_process_weight($element) {
* For assistance with handling the uploaded file correctly, see the API
* provided by file.inc.
*/
-function theme_file($element) {
+function theme_file($variables) {
+ $element = $variables['element'];
_form_set_class($element, array('form-file'));
return '<input type="file" name="' . $element['#name'] . '"' . ($element['#attributes'] ? ' ' . drupal_attributes($element['#attributes']) : '') . ' id="' . $element['#id'] . '" size="' . $element['#size'] . "\" />\n";
}
@@ -2613,15 +2675,18 @@ function theme_file($element) {
/**
* Theme a form element.
*
- * @param element
- * An associative array containing the properties of the element.
- * Properties used: #title, #description, #id, #required, #children
+ * @param $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ * Properties used: #title, #description, #id, #required, #children
+ *
* @return
* A string representing the form element.
*
* @ingroup themeable
*/
-function theme_form_element($element) {
+function theme_form_element($variables) {
+ $element = $variables['element'];
// This is also used in the installer, pre-database setup.
$t = get_t();
diff --git a/includes/locale.inc b/includes/locale.inc
index 8e7cc3cd4e23b7197c452407202f472430f29d3b..85e056ce1f7667b60d7259e5d2460a80b5625556 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -69,9 +69,17 @@ function locale_languages_overview_form() {
/**
* Theme the language overview form.
*
+ * @param $variables
+ * An associative array containing:
+ * - form: @todo: document
+ *
+ * @return
+ * A themed HTML string representing the form.
+ *
* @ingroup themeable
*/
-function theme_locale_languages_overview_form($form) {
+function theme_locale_languages_overview_form($variables) {
+ $form = $variables['form'];
$default = language_default();
foreach ($form['name'] as $key => $element) {
// Do not take form control structures.
@@ -96,7 +104,7 @@ function theme_locale_languages_overview_form($form) {
}
}
$header = array(array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Code')), array('data' => t('Direction')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations')));
- $output = theme('table', $header, $rows, array('id' => 'language-order'));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'language-order')));
$output .= drupal_render_children($form);
drupal_add_tabledrag('language-order', 'order', 'sibling', 'language-order-weight');
@@ -543,7 +551,7 @@ function locale_translate_overview_screen() {
$rows[$data->language][$data->textgroup] = $data->translation . '/' . $groupsums[$data->textgroup] . " ($ratio%)";
}
- return theme('table', $headers, $rows);
+ return theme('table', array('header' => $headers, 'rows' => $rows));
}
/**
* @} End of "locale-translate-overview"
@@ -2305,8 +2313,8 @@ function _locale_translate_seek() {
}
if (count($rows)) {
- $output .= theme('table', $header, $rows);
- if ($pager = theme('pager', NULL)) {
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
+ if ($pager = theme('pager', array('tags' => NULL))) {
$output .= $pager;
}
}
diff --git a/includes/menu.inc b/includes/menu.inc
index 590715f23928ddf2e9173698a6a5b8664762eb1f..a9511af9724d11fc2509039c2f354a9db9214646 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1308,21 +1308,33 @@ function template_preprocess_menu_tree(&$variables) {
/**
* Theme wrapper for the HTML output for a menu sub-tree.
*
+ * @param $variables
+ * An associative array containing:
+ * - tree: @todo: document
+ *
+ * @return
+ * A themed HTML string.
+ *
* @ingroup themeable
*/
-function theme_menu_tree($tree) {
- return '<ul class="menu">' . $tree . '</ul>';
+function theme_menu_tree($variables) {
+ return '<ul class="menu">' . $variables['tree'] . '</ul>';
}
/**
* Generate the HTML output for a menu link and submenu.
*
- * @param $element
- * Structured array data for a menu link.
+ * @param $variables
+ * An associative array containing:
+ * - element: Structured array data for a menu link.
+ *
+ * @return
+ * A themed HTML string.
*
* @ingroup themeable
*/
-function theme_menu_link(array $element) {
+function theme_menu_link(array $variables) {
+ $element = $variables['element'];
$sub_menu = '';
if ($element['#below']) {
@@ -1335,26 +1347,31 @@ function theme_menu_link(array $element) {
/**
* Generate the HTML output for a single local task link.
*
- * @param $link
- * A menu link array with 'title', 'href', and 'localized_options' keys.
- * @param $active
- * A boolean indicating whether the local task is active.
+ * @param $variables
+ * An associative array containing:
+ * - link: A menu link array with 'title', 'href', and 'localized_options'
+ * keys.
+ * - active: A boolean indicating whether the local task is active.
*
* @ingroup themeable
*/
-function theme_menu_local_task($link, $active = FALSE) {
- return '<li ' . ($active ? 'class="active" ' : '') . '>' . l($link['title'], $link['href'], $link['localized_options']) . "</li>\n";
+function theme_menu_local_task($variables) {
+ $link = $variables['link'];
+ return '<li ' . ($variables['active'] ? 'class="active" ' : '') . '>' . l($link['title'], $link['href'], $link['localized_options']) . "</li>\n";
}
/**
* Generate the HTML output for a single local action link.
*
- * @param $link
- * A menu link array with 'title', 'href', and 'localized_options' keys.
+ * @param $variables
+ * An associative array containing:
+ * - link: A menu link array with 'title', 'href', and 'localized_options'
+ * keys.
*
* @ingroup themeable
*/
-function theme_menu_local_action($link) {
+function theme_menu_local_action($variables) {
+ $link = $variables['link'];
return '<li>' . l($link['title'], $link['href'], $link['localized_options']) . "</li>\n";
}
@@ -1389,7 +1406,7 @@ function menu_get_active_help() {
// Add "more help" link on admin pages if the module provides a
// standalone help page.
if ($arg[0] == "admin" && user_access('access administration pages') && module_exists('help') && $function('admin/help#' . $arg[2], $empty_arg) && $help) {
- $output .= theme("more_help_link", url('admin/help/' . $arg[2]));
+ $output .= theme("more_help_link", array('url' => url('admin/help/' . $arg[2])));
}
}
return $output;
@@ -1597,17 +1614,17 @@ function menu_local_tasks($level = 0) {
for ($p = $item['tab_parent']; $tasks[$p]['type'] == MENU_DEFAULT_LOCAL_TASK; $p = $tasks[$p]['tab_parent']);
// Use the path of the parent instead.
$link['href'] = $tasks[$p]['href'];
- $tabs_current .= theme('menu_local_task', $link, TRUE);
+ $tabs_current .= theme('menu_local_task', array('link' => $link, 'active' => TRUE));
$next_path = $item['path'];
$tab_count++;
}
else {
if ($item['type'] == MENU_LOCAL_TASK) {
- $tabs_current .= theme('menu_local_task', $link);
+ $tabs_current .= theme('menu_local_task', array('link' => $link));
$tab_count++;
}
else {
- $actions_current .= theme('menu_local_action', $link);
+ $actions_current .= theme('menu_local_action', array('link' => $link));
$action_count++;
}
}
@@ -1649,14 +1666,14 @@ function menu_local_tasks($level = 0) {
}
// We check for the active tab.
if ($item['path'] == $path) {
- $tabs_current .= theme('menu_local_task', $link, TRUE);
+ $tabs_current .= theme('menu_local_task', array('link' => $link, 'active' => TRUE));
$next_path = $item['tab_parent'];
if (isset($tasks[$next_path])) {
$next_parent = $tasks[$next_path]['tab_parent'];
}
}
else {
- $tabs_current .= theme('menu_local_task', $link);
+ $tabs_current .= theme('menu_local_task', array('link' => $link));
}
}
}
diff --git a/includes/pager.inc b/includes/pager.inc
index 0bee418dfdbc2dcbf5fb5a401f773bb07ff5c0b1..f9c477a0864ae1746f111a9f3fbacfbd28c71719 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -192,20 +192,25 @@ function pager_get_query_parameters() {
* retrieve a pager control so that users can view other results.
* Format a list of nearby pages with additional query results.
*
- * @param $tags
- * An array of labels for the controls in the pager.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
- * @param $quantity
- * The number of pages in the list.
+ * @param $variables
+ * An associative array containing:
+ * - tags: An array of labels for the controls in the pager.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager links.
+ * - quantity: The number of pages in the list.
+ *
* @return
* An HTML string that generates the query pager.
*
* @ingroup themeable
*/
-function theme_pager($tags = array(), $element = 0, $parameters = array(), $quantity = 9) {
+function theme_pager($variables) {
+ $tags = $variables['tags'];
+ $element = $variables['element'];
+ $parameters = $variables['parameters'];
+ $quantity = $variables['quantity'];
global $pager_page_array, $pager_total;
// Calculate various markers within this pager piece:
@@ -235,10 +240,10 @@ function theme_pager($tags = array(), $element = 0, $parameters = array(), $quan
}
// End of generation loop preparation.
- $li_first = theme('pager_first', (isset($tags[0]) ? $tags[0] : t('« first')), $element, $parameters);
- $li_previous = theme('pager_previous', (isset($tags[1]) ? $tags[1] : t('‹ previous')), $element, 1, $parameters);
- $li_next = theme('pager_next', (isset($tags[3]) ? $tags[3] : t('next ›')), $element, 1, $parameters);
- $li_last = theme('pager_last', (isset($tags[4]) ? $tags[4] : t('last »')), $element, $parameters);
+ $li_first = theme('pager_first', array('text' => (isset($tags[0]) ? $tags[0] : t('« first')), 'element' => $element, 'parameters' => $parameters));
+ $li_previous = theme('pager_previous', array('text' => (isset($tags[1]) ? $tags[1] : t('‹ previous')), 'element' => $element, 'interval' => 1, 'parameters' => $parameters));
+ $li_next = theme('pager_next', array('text' => (isset($tags[3]) ? $tags[3] : t('next ›')), 'element' => $element, 'interval' => 1, 'parameters' => $parameters));
+ $li_last = theme('pager_last', array('text' => (isset($tags[4]) ? $tags[4] : t('last »')), 'element' => $element, 'parameters' => $parameters));
if ($pager_total[$element] > 1) {
if ($li_first) {
@@ -267,7 +272,7 @@ function theme_pager($tags = array(), $element = 0, $parameters = array(), $quan
if ($i < $pager_current) {
$items[] = array(
'class' => array('pager-item'),
- 'data' => theme('pager_previous', $i, $element, ($pager_current - $i), $parameters),
+ 'data' => theme('pager_previous', array('text' => $i, 'element' => $element, 'interval' => ($pager_current - $i), 'parameters' => $parameters)),
);
}
if ($i == $pager_current) {
@@ -279,7 +284,7 @@ function theme_pager($tags = array(), $element = 0, $parameters = array(), $quan
if ($i > $pager_current) {
$items[] = array(
'class' => array('pager-item'),
- 'data' => theme('pager_next', $i, $element, ($i - $pager_current), $parameters),
+ 'data' => theme('pager_next', array('text' => $i, 'element' => $element, 'interval' => ($i - $pager_current), 'parameters' => $parameters)),
);
}
}
@@ -303,7 +308,7 @@ function theme_pager($tags = array(), $element = 0, $parameters = array(), $quan
'data' => $li_last,
);
}
- return theme('item_list', $items, NULL, 'ul', array('class' => array('pager')));
+ return theme('item_list', array('items' => $items, 'title' => NULL, 'type' => 'ul', 'attributes' => array('class' => array('pager'))));
}
}
@@ -318,24 +323,29 @@ function theme_pager($tags = array(), $element = 0, $parameters = array(), $quan
/**
* Format a "first page" link.
*
- * @param $text
- * The name (or image) of the link.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
+ * @param $variables
+ * An associative array containing:
+ * - text: The name (or image) of the link.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager links.
+ *
* @return
* An HTML string that generates this piece of the query pager.
*
* @ingroup themeable
*/
-function theme_pager_first($text, $element = 0, $parameters = array()) {
+function theme_pager_first($variables) {
+ $text = $variables['text'];
+ $element = $variables['element'];
+ $parameters = $variables['parameters'];
global $pager_page_array;
$output = '';
// If we are anywhere but the first page
if ($pager_page_array[$element] > 0) {
- $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters);
+ $output = theme('pager_link', array('text' => $text, 'page_new' => pager_load_array(0, $element, $pager_page_array), 'element' => $element, 'parameters' => $parameters));
}
return $output;
@@ -344,20 +354,25 @@ function theme_pager_first($text, $element = 0, $parameters = array()) {
/**
* Format a "previous page" link.
*
- * @param $text
- * The name (or image) of the link.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $interval
- * The number of pages to move backward when the link is clicked.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
+ * @param $variables
+ * An associative array containing:
+ * - text: The name (or image) of the link.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - interval: The number of pages to move backward when the link is clicked.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager links.
+ *
* @return
* An HTML string that generates this piece of the query pager.
*
* @ingroup themeable
*/
-function theme_pager_previous($text, $element = 0, $interval = 1, $parameters = array()) {
+function theme_pager_previous($variables) {
+ $text = $variables['text'];
+ $element = $variables['element'];
+ $interval = $variables['interval'];
+ $parameters = $variables['parameters'];
global $pager_page_array;
$output = '';
@@ -367,11 +382,11 @@ function theme_pager_previous($text, $element = 0, $interval = 1, $parameters =
// If the previous page is the first page, mark the link as such.
if ($page_new[$element] == 0) {
- $output = theme('pager_first', $text, $element, $parameters);
+ $output = theme('pager_first', array('text' => $text, 'element' => $element, 'parameters' => $parameters));
}
// The previous page is not the first page.
else {
- $output = theme('pager_link', $text, $page_new, $element, $parameters);
+ $output = theme('pager_link', array('text' => $text, 'page_new' => $page_new, 'element' => $element, 'parameters' => $parameters));
}
}
@@ -381,20 +396,25 @@ function theme_pager_previous($text, $element = 0, $interval = 1, $parameters =
/**
* Format a "next page" link.
*
- * @param $text
- * The name (or image) of the link.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $interval
- * The number of pages to move forward when the link is clicked.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
+ * @param $variables
+ * An associative array containing:
+ * - text: The name (or image) of the link.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - interval: The number of pages to move forward when the link is clicked.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager links.
+ *
* @return
* An HTML string that generates this piece of the query pager.
*
* @ingroup themeable
*/
-function theme_pager_next($text, $element = 0, $interval = 1, $parameters = array()) {
+function theme_pager_next($variables) {
+ $text = $variables['text'];
+ $element = $variables['element'];
+ $interval = $variables['interval'];
+ $parameters = $variables['parameters'];
global $pager_page_array, $pager_total;
$output = '';
@@ -403,11 +423,11 @@ function theme_pager_next($text, $element = 0, $interval = 1, $parameters = arra
$page_new = pager_load_array($pager_page_array[$element] + $interval, $element, $pager_page_array);
// If the next page is the last page, mark the link as such.
if ($page_new[$element] == ($pager_total[$element] - 1)) {
- $output = theme('pager_last', $text, $element, $parameters);
+ $output = theme('pager_last', array('text' => $text, 'element' => $element, 'parameters' => $parameters));
}
// The next page is not the last page.
else {
- $output = theme('pager_link', $text, $page_new, $element, $parameters);
+ $output = theme('pager_link', array('text' => $text, 'page_new' => $page_new, 'element' => $element, 'parameters' => $parameters));
}
}
@@ -417,24 +437,29 @@ function theme_pager_next($text, $element = 0, $interval = 1, $parameters = arra
/**
* Format a "last page" link.
*
- * @param $text
- * The name (or image) of the link.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
+ * @param $variables
+ * An associative array containing:
+ * - text: The name (or image) of the link.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager links.
+ *
* @return
* An HTML string that generates this piece of the query pager.
*
* @ingroup themeable
*/
-function theme_pager_last($text, $element = 0, $parameters = array()) {
+function theme_pager_last($variables) {
+ $text = $variables['text'];
+ $element = $variables['element'];
+ $parameters = $variables['parameters'];
global $pager_page_array, $pager_total;
$output = '';
// If we are anywhere but the last page
if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
- $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters);
+ $output = theme('pager_link', array('text' => $text, 'page_new' => pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), 'element' => $element, 'parameters' => $parameters));
}
return $output;
@@ -444,20 +469,28 @@ function theme_pager_last($text, $element = 0, $parameters = array()) {
/**
* Format a link to a specific query result page.
*
- * @param $page_new
- * The first result to display on the linked page.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $parameters
- * An associative array of query string parameters to append to the pager link.
- * @param $attributes
- * An associative array of HTML attributes to apply to a pager anchor tag.
+ * @param $variables
+ * An associative array containing:
+ * - page_new: The first result to display on the linked page.
+ * - element: An optional integer to distinguish between multiple pagers on
+ * one page.
+ * - parameters: An associative array of query string parameters to append to
+ * the pager link.
+ * - attributes: An associative array of HTML attributes to apply to a pager
+ * anchor tag.
+ *
* @return
* An HTML string that generates the link.
*
* @ingroup themeable
*/
-function theme_pager_link($text, $page_new, $element, $parameters = array(), $attributes = array()) {
+function theme_pager_link($variables) {
+ $text = $variables['text'];
+ $page_new = $variables['page_new'];
+ $element = $variables['element'];
+ $parameters = $variables['parameters'];
+ $attributes = $variables['attributes'];
+
$page = isset($_GET['page']) ? $_GET['page'] : '';
if ($new_page = implode(',', pager_load_array($page_new[$element], $element, explode(',', $page)))) {
$parameters['page'] = $new_page;
diff --git a/includes/tablesort.inc b/includes/tablesort.inc
index 6c005977cc41ba31895ad4824b94ae93bc13d1c9..d83e575a0344e87d0da4134a82f29a5c67c0818d 100644
--- a/includes/tablesort.inc
+++ b/includes/tablesort.inc
@@ -169,7 +169,7 @@ function tablesort_header($cell, $header, $ts) {
if ($cell['data'] == $ts['name']) {
$ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc');
$cell['class'][] = 'active';
- $image = theme('tablesort_indicator', $ts['sort']);
+ $image = theme('tablesort_indicator', array('style' => $ts['sort']));
}
else {
// If the user clicks a different header, we want to sort ascending initially.
diff --git a/includes/theme.inc b/includes/theme.inc
index 20571c178bf15336c1e930950082bf242d15bc95..b06f62c32e5be671957efdeeacaabb1cf5268ccd 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -609,12 +609,10 @@ function list_themes($refresh = FALSE) {
* registry is checked to determine which implementation to use, which may
* be a function or a template.
*
- * If the implementation is a template, the arguments are converted to a
- * $variables array. This array is then modified by the module implementing
- * the hook, theme engine (if applicable) and the theme. The following
- * functions may be used to modify the $variables array. They are processed in
- * two distinct phases; "preprocess" and "process" functions. The order it is
- * listed here is the order in which it will execute.
+ * If the implementation is a template, the following functions may be used to
+ * modify the $variables array. They are processed in two distinct phases;
+ * "preprocess" and "process" functions. The order listed here is the order in
+ * which they execute.
*
* - template_preprocess(&$variables)
* This sets a default set of variables for all template implementations.
@@ -705,21 +703,9 @@ function list_themes($refresh = FALSE) {
*
* If the implementation is a function, only the hook-specific preprocess
* and process functions (the ones ending in _HOOK) are called from the
- * above list. There are two reasons why the non-hook-specific preprocess
- * and process functions (the ones not ending in _HOOK) are not called for
- * function-implemented theme hooks:
- *
- * - Function-implemented theme hooks need to be fast, and calling the
- * non-hook-specific preprocess and process functions on them would incur
- * a noticeable performance penalty.
- *
- * - Function-implemented theme hooks can only make use of variables
- * declared as arguments within the hook_theme() function that registers
- * the theme hook, and cannot make use of additional generic variables.
- * For the most part, non-hook-specific preprocess and process functions
- * add/modify variables other than the theme hook's arguments, variables
- * that are potentially useful in template files, but unavailable to
- * function implementations.
+ * above list. This is because theme hooks with function implementations
+ * need to be fast, and calling the non-hook-specific preprocess and process
+ * functions for them would incur a noticeable performance penalty.
*
* For template-implemented theme hooks, there are two special variables that
* these preprocess and process functions can set:
@@ -746,21 +732,26 @@ function list_themes($refresh = FALSE) {
* so that if the specific theme hook isn't implemented anywhere, a more
* generic one will be used. This can allow themes to create specific theme
* implementations for named objects.
- * @param ...
- * Additional arguments to pass along to the theme function.
+ *
+ * @param $variables
+ * An associative array of variables to merge with defaults from the theme
+ * registry, pass to preprocess and process functions for modification, and
+ * finally, pass to the function or template implementing the theme hook.
+ * Alternatively, this can be a renderable array, in which case, its properties
+ * are mapped to variables expected by the theme hook implementations.
+ *
* @return
* An HTML string that generates the themed output.
*/
-function theme() {
- $args = func_get_args();
- $hook = array_shift($args);
-
+function theme($hook, $variables = array()) {
static $hooks = NULL;
if (!isset($hooks)) {
drupal_theme_initialize();
$hooks = theme_get_registry();
}
+ // If an array of hook candidates were passed, use the first one that has an
+ // implementation.
if (is_array($hook)) {
foreach ($hook as $candidate) {
if (isset($hooks[$candidate])) {
@@ -786,99 +777,78 @@ function theme() {
include_once DRUPAL_ROOT . '/' . $include_file;
}
}
- if (isset($info['function'])) {
- // The theme call is a function.
-
- // If a theme function that does not expect a renderable array is called
- // with a renderable array as the only argument (via drupal_render), then
- // we take the arguments from the properties of the renderable array. If
- // missing, use hook_theme() defaults.
- if (isset($args[0]) && is_array($args[0]) && isset($args[0]['#theme']) && count($info['arguments']) > 1) {
- $new_args = array();
+
+ // If a renderable array is passed as $variables, then set $variables to
+ // what's expected by the theme hook. If the theme hook expects a single
+ // argument, set the renderable array as that argument. If the theme hook
+ // expects multiple arguments, set the properties of the renderable array as
+ // those arguments.
+ if (isset($variables['#theme']) || isset($variables['#theme_wrappers'])) {
+ $element = $variables;
+ $variables = array();
+ $n = count($info['arguments']);
+ if ($n == 1) {
+ $arg_keys = array_keys($info['arguments']);
+ $variables[$arg_keys[0]] = $element;
+ }
+ elseif ($n > 1) {
foreach ($info['arguments'] as $name => $default) {
- $new_args[] = isset($args[0]["#$name"]) ? $args[0]["#$name"] : $default;
+ if (isset($element["#$name"])) {
+ $variables[$name] = $element["#$name"];
+ }
}
- $args = $new_args;
}
+ }
- // Invoke the variable processors, if any.
- // We minimize the overhead for theming hooks that have no processors and
- // are called many times per page request by caching '_no_processors'. If
- // we do have processors, then the overhead of calling them overshadows the
- // overhead of calling empty().
- if (!isset($info['_no_processors'])) {
- if (!empty($info['preprocess functions']) || !empty($info['process functions'])) {
- $variables = array(
- 'theme_functions' => array(),
- );
- if (!empty($info['arguments'])) {
- $count = 0;
- foreach ($info['arguments'] as $name => $default) {
- $variables[$name] = isset($args[$count]) ? $args[$count] : $default;
- $count++;
- }
- }
- // We don't want a poorly behaved process function changing $hook.
- $hook_clone = $hook;
- foreach (array('preprocess functions', 'process functions') as $phase) {
- if (!empty($info[$phase])) {
- foreach ($info[$phase] as $processor_function) {
- if (function_exists($processor_function)) {
- $processor_function($variables, $hook_clone);
- }
- }
- }
- }
- if (!empty($info['arguments'])) {
- $count = 0;
- foreach ($info['arguments'] as $name => $default) {
- $args[$count] = $variables[$name];
- $count++;
- }
- }
+ // Merge in argument defaults.
+ if (!empty($info['arguments'])) {
+ $variables += $info['arguments'];
+ }
- // Get suggestions for alternate functions out of the variables that
- // were set. This lets us dynamically choose a function from a list.
- // The order is FILO, so this array is ordered from least appropriate
- // functions to most appropriate last.
- $suggestions = array();
- if (isset($variables['theme_functions'])) {
- $suggestions = $variables['theme_functions'];
- }
- if (isset($variables['theme_function'])) {
- $suggestions[] = $variables['theme_function'];
- }
- foreach (array_reverse($suggestions) as $suggestion) {
- if (function_exists($suggestion)) {
- $info['function'] = $suggestion;
- break;
+ // Invoke the variable processors, if any. The processors may specify
+ // alternate suggestions for which function/template should be used.
+ if (isset($info['preprocess functions']) || isset($info['process functions'])) {
+ $variables['theme_functions'] = array();
+ $variables['template_files'] = array();
+ foreach (array('preprocess functions', 'process functions') as $phase) {
+ if (!empty($info[$phase])) {
+ foreach ($info[$phase] as $processor_function) {
+ if (function_exists($processor_function)) {
+ // We don't want a poorly behaved process function changing $hook.
+ $hook_clone = $hook;
+ $processor_function($variables, $hook_clone);
}
}
}
- else {
- $hooks[$hook]['_no_processors'] = TRUE;
+ }
+ // Function suggestion takes priority over template suggestion.
+ // theme_function takes priority over theme_functions.
+ // theme_functions are in FILO order (least appropriate to most appropriate).
+ // Here, just look for function suggestions. Deal with template
+ // suggestions only after determining that the theme call is a template.
+ $suggestions = array();
+ if (!empty($variables['theme_functions'])) {
+ $suggestions = $variables['theme_functions'];
+ }
+ if (!empty($variables['theme_function'])) {
+ $suggestions[] = $variables['theme_function'];
+ }
+ foreach (array_reverse($suggestions) as $suggestion) {
+ if (function_exists($suggestion)) {
+ $info['function'] = $suggestion;
+ break;
}
}
+ }
- // Call the function.
+ // Generate the output using either a function or a template.
+ if (isset($info['function'])) {
if (function_exists($info['function'])) {
- $output = call_user_func_array($info['function'], $args);
+ $output = $info['function']($variables);
}
}
else {
- // The theme call is a template.
- $variables = array(
- 'template_files' => array()
- );
- if (!empty($info['arguments'])) {
- $count = 0;
- foreach ($info['arguments'] as $name => $default) {
- $variables[$name] = isset($args[$count]) ? $args[$count] : $default;
- $count++;
- }
- }
-
- // default render function and extension.
+ // Default render function and extension.
$render_function = 'theme_render_template';
$extension = '.tpl.php';
@@ -898,44 +868,32 @@ function theme() {
}
}
- // This construct ensures that we can keep a reference through
- // call_user_func_array.
- $args = array(&$variables, $hook);
- foreach (array('preprocess functions', 'process functions') as $phase) {
- if (!empty($info[$phase])) {
- foreach ($info[$phase] as $processor_function) {
- if (function_exists($processor_function)) {
- call_user_func_array($processor_function, $args);
- }
- }
- }
- }
-
- // Get suggestions for alternate templates out of the variables
- // that were set. This lets us dynamically choose a template
- // from a list. The order is FILO, so this array is ordered from
- // least appropriate first to most appropriate last.
+ // Find which template file exists and can be used. Priority order is:
+ // 1. $variables['template_file'].
+ // 2. $variables['template_files'] in FILO order (later in array is higher
+ // priority).
+ // 3. $info['template'].
$suggestions = array();
-
if (isset($variables['template_files'])) {
$suggestions = $variables['template_files'];
}
if (isset($variables['template_file'])) {
$suggestions[] = $variables['template_file'];
}
-
if ($suggestions) {
$template_file = drupal_discover_template($info['theme paths'], $suggestions, $extension);
}
-
if (empty($template_file)) {
$template_file = $info['template'] . $extension;
if (isset($info['path'])) {
$template_file = $info['path'] . '/' . $template_file;
}
}
+
+ // Render the output using the found template file.
$output = $render_function($template_file, $variables);
}
+
// restore path_to_theme()
$theme_path = $temp;
return $output;
@@ -1288,11 +1246,12 @@ function theme_render_template($template_file, $variables) {
*
* Inside Drupal, the theme layer is utilized by the use of the theme()
* function, which is passed the name of a component (the theme hook)
- * and several arguments. For example, theme('table', $header, $rows);
+ * and an array of variables. For example,
+ * theme('table', array('header' => $header, 'rows' => $rows));
* Additionally, the theme() function can take an array of theme
* hooks, which can be used to provide 'fallback' implementations to
* allow for more specific control of output. For example, the function:
- * theme(array('table__foo', 'table'), $header, $rows) would look to see if
+ * theme(array('table__foo', 'table'), $variables) would look to see if
* 'table__foo' is registered anywhere; if it is not, it would 'fall back'
* to the generic 'table' implementation. This can be used to attach specific
* theme functions to named objects, allowing the themer more control over
@@ -1344,30 +1303,37 @@ function theme_render_template($template_file, $variables) {
* Formats text for emphasized display in a placeholder inside a sentence.
* Used automatically by t().
*
- * @param $text
- * The text to format (plain-text).
+ * @param $variables
+ * An associative array containing:
+ * - text: The text to format (plain-text).
+ *
* @return
* The formatted text (html).
*/
-function theme_placeholder($text) {
- return '<em>' . check_plain($text) . '</em>';
+function theme_placeholder($variables) {
+ return '<em>' . check_plain($variables['text']) . '</em>';
}
/**
* Return a themed set of status and/or error messages. The messages are grouped
* by type.
*
- * An invisible heading identifies the messages for assistive technology. Sighted
- * users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html for info.
+ * An invisible heading identifies the messages for assistive technology.
+ * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
+ * for info.
*
- * @param $display
- * (optional) Set to 'status' or 'error' to display only messages of that type.
+ * @param $variables
+ * An associative array containing:
+ * - display: (optional) Set to 'status' or 'error' to display only messages
+ * of that type.
*
* @return
* A string containing the messages.
*/
-function theme_status_messages($display = NULL) {
+function theme_status_messages($variables) {
+ $display = $variables['display'];
$output = '';
+
$status_heading = array(
'status' => t('Status message'),
'error' => t('Error message'),
@@ -1396,34 +1362,41 @@ function theme_status_messages($display = NULL) {
/**
* Return a themed set of links.
*
- * @param $links
- * A keyed array of links to be themed. The key for each link is used as its css class.
- * Each link should be itself an array, with the following keys:
- * - title: the link text
- * - href: the link URL. If omitted, the 'title' is shown as a plain text item in the links list.
- * - html: (optional) set this to TRUE if 'title' is HTML so it will be escaped.
- * Array items are passed on to the l() function's $options parameter when creating the link.
- * @param $attributes
- * A keyed array of attributes.
- * @param $heading
- * An optional keyed array or a string for a heading to precede the links.
- * When using an array the following keys can be used:
- * - text: the heading text
- * - level: the heading level (e.g. 'h2', 'h3')
- * - class: (optional) an array of the CSS classes for the heading
- * When using a string it will be used as the text of the heading and the
- * level will default to 'h2'.
- * Headings should be used on navigation menus and any list of links that
- * consistently appears on multiple pages. To make the heading invisible
- * use the 'element-invisible' CSS class. Do not use 'display:none', which
- * removes it from screen-readers and assistive technology. Headings allow
- * screen-reader and keyboard only users to navigate to or skip the links.
- * See http://juicystudio.com/article/screen-readers-display-none.php
- * and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ * @param $variables
+ * An associative array containing:
+ * - links: A keyed array of links to be themed. The key for each link is used
+ * as its css class. Each link should be itself an array, with the following
+ * keys:
+ * - title: the link text
+ * - href: the link URL. If omitted, the 'title' is shown as a plain text
+ * item in the links list.
+ * - html: (optional) set this to TRUE if 'title' is HTML so it will be
+ * escaped.
+ * Array items are passed on to the l() function's $options parameter when
+ * creating the link.
+ * - attributes: A keyed array of attributes.
+ * - heading: An optional keyed array or a string for a heading to precede the
+ * links. When using an array the following keys can be used:
+ * - text: the heading text
+ * - level: the heading level (e.g. 'h2', 'h3')
+ * - class: (optional) an array of the CSS classes for the heading
+ * When using a string it will be used as the text of the heading and the
+ * level will default to 'h2'.
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible
+ * use the 'element-invisible' CSS class. Do not use 'display:none', which
+ * removes it from screen-readers and assistive technology. Headings allow
+ * screen-reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php
+ * and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
* @return
* A string containing an unordered list of links.
*/
-function theme_links($links, $attributes = array('class' => array('links')), $heading = array()) {
+function theme_links($variables) {
+ $links = $variables['links'];
+ $attributes = $variables['attributes'];
+ $heading = $variables['heading'];
global $language;
$output = '';
@@ -1499,20 +1472,27 @@ function theme_links($links, $attributes = array('class' => array('links')), $he
/**
* Return a themed image.
*
- * @param $path
- * Either the path of the image file (relative to base_path()) or a full URL.
- * @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:
+ * - path: Either the path of the image file (relative to base_path()) or a
+ * full URL.
+ * - 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.
*/
-function theme_image($path, $alt = '', $title = '', $attributes = array(), $getsize = TRUE) {
+function theme_image($variables) {
+ $path = $variables['path'];
+ $alt = $variables['alt'];
+ $title = $variables['title'];
+ $attributes = $variables['attributes'];
+ $getsize = $variables['getsize'];
+
if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) {
$attributes = drupal_attributes($attributes);
$url = file_create_url($path);
@@ -1523,11 +1503,16 @@ function theme_image($path, $alt = '', $title = '', $attributes = array(), $gets
/**
* Return a themed breadcrumb trail.
*
- * @param $breadcrumb
- * An array containing the breadcrumb links.
- * @return a string containing the breadcrumb output.
+ * @param $variables
+ * An associative array containing:
+ * - breadcrumb: An array containing the breadcrumb links.
+ *
+ * @return
+ * A string containing the breadcrumb output.
*/
-function theme_breadcrumb($breadcrumb) {
+function theme_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.
@@ -1541,89 +1526,97 @@ function theme_breadcrumb($breadcrumb) {
/**
* Return a themed submenu, typically displayed under the tabs.
*
- * @param $links
- * An array of links.
+ * @param $variables
+ * An associative array containing:
+ * - links: An array of links.
*/
-function theme_submenu($links) {
+function theme_submenu($variables) {
+ $links = $variables['links'];
+
return '<div class="submenu">' . implode(' | ', $links) . '</div>';
}
/**
* Return a themed table.
*
- * @param $header
- * An array containing the table headers. Each element of the array can be
- * either a localized string or an associative array with the following keys:
- * - "data": The localized title of the table column.
- * - "field": The database field represented in the table column (required if
- * user is to be able to sort on this column).
- * - "sort": A default sort order for this column ("asc" or "desc").
- * - Any HTML attributes, such as "colspan", to apply to the column header cell.
- * @param $rows
- * An array of table rows. Every row is an array of cells, or an associative
- * array with the following keys:
- * - "data": an array of cells
- * - Any HTML attributes, such as "class", to apply to the table row.
- *
- * Each cell can be either a string or an associative array with the following keys:
- * - "data": The string to display in the table cell.
- * - "header": Indicates this cell is a header.
- * - Any HTML attributes, such as "colspan", to apply to the table cell.
- *
- * Here's an example for $rows:
- * @verbatim
- * $rows = array(
- * // Simple row
- * array(
- * 'Cell 1', 'Cell 2', 'Cell 3'
- * ),
- * // Row with attributes on the row and some of its cells.
- * array(
- * 'data' => array('Cell 1', array('data' => 'Cell 2', 'colspan' => 2)), 'class' => array('funky')
- * )
- * );
- * @endverbatim
- *
- * @param $attributes
- * An array of HTML attributes to apply to the table tag.
- * @param $caption
- * A localized string to use for the <caption> tag.
- * @param $colgroups
- * An array of column groups. Each element of the array can be either:
- * - An array of columns, each of which is an associative array of HTML attributes
- * applied to the COL element.
- * - An array of attributes applied to the COLGROUP element, which must include a
- * "data" attribute. To add attributes to COL elements, set the "data" attribute
- * with an array of columns, each of which is an associative array of HTML attributes.
- * Here's an example for $colgroup:
- * @verbatim
- * $colgroup = array(
- * // COLGROUP with one COL element.
- * array(
+ * @param $variables
+ * An associative array containing:
+ * - header: An array containing the table headers. Each element of the array
+ * can be either a localized string or an associative array with the
+ * following keys:
+ * - "data": The localized title of the table column.
+ * - "field": The database field represented in the table column (required
+ * if user is to be able to sort on this column).
+ * - "sort": A default sort order for this column ("asc" or "desc").
+ * - Any HTML attributes, such as "colspan", to apply to the column header
+ * cell.
+ * - rows: An array of table rows. Every row is an array of cells, or an
+ * associative array with the following keys:
+ * - "data": an array of cells
+ * - Any HTML attributes, such as "class", to apply to the table row.
+ * Each cell can be either a string or an associative array with the
+ * following keys:
+ * - "data": The string to display in the table cell.
+ * - "header": Indicates this cell is a header.
+ * - Any HTML attributes, such as "colspan", to apply to the table cell.
+ * Here's an example for $rows:
+ * @verbatim
+ * $rows = array(
+ * // Simple row
* array(
- * 'class' => array('funky'), // Attribute for the COL element.
+ * 'Cell 1', 'Cell 2', 'Cell 3'
* ),
- * ),
- * // Colgroup with attributes and inner COL elements.
- * array(
- * 'data' => array(
+ * // Row with attributes on the row and some of its cells.
+ * array(
+ * 'data' => array('Cell 1', array('data' => 'Cell 2', 'colspan' => 2)), 'class' => array('funky')
+ * )
+ * );
+ * @endverbatim
+ * - attributes: An array of HTML attributes to apply to the table tag.
+ * - caption: A localized string to use for the <caption> tag.
+ * - colgroups: An array of column groups. Each element of the array can be
+ * either:
+ * - An array of columns, each of which is an associative array of HTML
+ * attributes applied to the COL element.
+ * - An array of attributes applied to the COLGROUP element, which must
+ * include a "data" attribute. To add attributes to COL elements, set the
+ * "data" attribute with an array of columns, each of which is an
+ * associative array of HTML attributes.
+ * Here's an example for $colgroup:
+ * @verbatim
+ * $colgroup = array(
+ * // COLGROUP with one COL element.
+ * array(
* array(
* 'class' => array('funky'), // Attribute for the COL element.
* ),
* ),
- * 'class' => array('jazzy'), // Attribute for the COLGROUP element.
- * ),
- * );
- * @endverbatim
- * These optional tags are used to group and set properties on columns
- * within a table. For example, one may easily group three columns and
- * apply same background style to all.
- * @param $sticky
- * Use a "sticky" table header.
+ * // Colgroup with attributes and inner COL elements.
+ * array(
+ * 'data' => array(
+ * array(
+ * 'class' => array('funky'), // Attribute for the COL element.
+ * ),
+ * ),
+ * 'class' => array('jazzy'), // Attribute for the COLGROUP element.
+ * ),
+ * );
+ * @endverbatim
+ * These optional tags are used to group and set properties on columns
+ * within a table. For example, one may easily group three columns and
+ * apply same background style to all.
+ * - sticky: Use a "sticky" table header.
+ *
* @return
* An HTML string representing the table.
*/
-function theme_table($header, $rows, $attributes = array(), $caption = NULL, $colgroups = array(), $sticky = TRUE) {
+function theme_table($variables) {
+ $header = $variables['header'];
+ $rows = $variables['rows'];
+ $attributes = $variables['attributes'];
+ $caption = $variables['caption'];
+ $colgroups = $variables['colgroups'];
+ $sticky = $variables['sticky'];
// Add sticky headers, if applicable.
if (count($header) && $sticky) {
@@ -1747,17 +1740,19 @@ function theme_table_select_header_cell() {
/**
* Return a themed sort icon.
*
- * @param $style
- * Set to either asc or desc. This sets which icon to show.
+ * @param $variables
+ * An associative array containing:
+ * - style: Set to either asc or desc. This sets which icon to show.
+ *
* @return
* A themed sort icon.
*/
-function theme_tablesort_indicator($style) {
- if ($style == "asc") {
- return theme('image', 'misc/arrow-asc.png', t('sort icon'), t('sort ascending'));
+function theme_tablesort_indicator($variables) {
+ if ($variables['style'] == "asc") {
+ return theme('image', array('path' => 'misc/arrow-asc.png', 'alt' => t('sort icon'), 'title' => t('sort ascending')));
}
else {
- return theme('image', 'misc/arrow-desc.png', t('sort icon'), t('sort descending'));
+ return theme('image', array('path' => 'misc/arrow-desc.png', 'alt' => t('sort icon'), 'title' => t('sort descending')));
}
}
@@ -1765,13 +1760,16 @@ function theme_tablesort_indicator($style) {
* Return a themed marker, useful for marking new or updated
* content.
*
- * @param $type
- * Number representing the marker type to display
- * @see MARK_NEW, MARK_UPDATED, MARK_READ
+ * @param $variables
+ * An associative array containing:
+ * - type: Number representing the marker type to display.
+ * @see MARK_NEW, MARK_UPDATED, MARK_READ
+ *
* @return
* A string containing the marker.
*/
-function theme_mark($type = MARK_NEW) {
+function theme_mark($variables) {
+ $type = $variables['type'];
global $user;
if ($user->uid) {
if ($type == MARK_NEW) {
@@ -1786,22 +1784,27 @@ function theme_mark($type = MARK_NEW) {
/**
* Return a themed list of items.
*
- * @param $items
- * An array of items to be displayed in the list. If an item is a string,
- * then it is used as is. If an item is an array, then the "data" element of
- * the array is used as the contents of the list item. If an item is an array
- * with a "children" element, those children are displayed in a nested list.
- * All other elements are treated as attributes of the list item element.
- * @param $title
- * The title of the list.
- * @param $type
- * The type of list to return (e.g. "ul", "ol")
- * @param $attributes
- * The attributes applied to the list element.
+ * @param $variables
+ * An associative array containing:
+ * - items: An array of items to be displayed in the list. If an item is a
+ * string, then it is used as is. If an item is an array, then the "data"
+ * element of the array is used as the contents of the list item. If an item
+ * is an array with a "children" element, those children are displayed in a
+ * nested list. All other elements are treated as attributes of the list
+ * item element.
+ * - title: The title of the list.
+ * - type: The type of list to return (e.g. "ul", "ol").
+ * - attributes: The attributes applied to the list element.
+ *
* @return
* A string containing the list output.
*/
-function theme_item_list($items = array(), $title = NULL, $type = 'ul', $attributes = array()) {
+function theme_item_list($variables) {
+ $items = $variables['items'];
+ $title = $variables['title'];
+ $type = $variables['type'];
+ $attributes = $variables['attributes'];
+
$output = '<div class="item-list">';
if (isset($title)) {
$output .= '<h3>' . $title . '</h3>';
@@ -1849,92 +1852,89 @@ function theme_item_list($items = array(), $title = NULL, $type = 'ul', $attribu
/**
* Returns code that emits the 'more help'-link.
*/
-function theme_more_help_link($url) {
- return '<div class="more-help-link">' . t('<a href="@link">More help</a>', array('@link' => check_url($url))) . '</div>';
+function theme_more_help_link($variables) {
+ return '<div class="more-help-link">' . t('<a href="@link">More help</a>', array('@link' => check_url($variables['url']))) . '</div>';
}
/**
* Return code that emits an feed icon.
*
- * @param $url
- * The url of the feed.
- * @param $title
- * A descriptive title of the feed.
+ * @param $variables
+ * An associative array containing:
+ * - url: The url of the feed.
+ * - 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 '<a href="' . check_url($url) . '" title="' . $text . '" class="feed-icon">' . $image . '</a>';
+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 '<a href="' . check_url($variables['url']) . '" title="' . $text . '" class="feed-icon">' . $image . '</a>';
}
}
/**
* 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 '<div class="more-link">' . t('<a href="@link" title="@title">more</a>', array('@link' => check_url($url), '@title' => $title)) . '</div>';
+function theme_more_link($variables) {
+ return '<div class="more-link">' . t('<a href="@link" title="@title">more</a>', array('@link' => check_url($variables['url']), '@title' => $variables['title'])) . '</div>';
}
/**
* 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(&$variables) {
// 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 = '<span' . drupal_attributes($object->attributes) . '>' . $object->name . $object->extra . '</span>';
+ // $variables['attributes_array']['class'][] = 'myclass';
+ $output = '<span' . drupal_attributes($variables['attributes_array']) . '>' . $variables['name'] . $variables['extra'] . '</span>';
}
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 = '<div id="progress" class="progress">';
- $output .= '<div class="bar"><div class="filled" style="width: ' . $percent . '%"></div></div>';
- $output .= '<div class="percentage">' . $percent . '%</div>';
- $output .= '<div class="message">' . $message . '</div>';
+ $output .= '<div class="bar"><div class="filled" style="width: ' . $variables['percent'] . '%"></div></div>';
+ $output .= '<div class="percentage">' . $variables['percent'] . '%</div>';
+ $output .= '<div class="message">' . $variables['message'] . '</div>';
$output .= '</div>';
return $output;
@@ -2005,14 +2013,16 @@ function theme_progress_bar($percent, $message) {
/**
* 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 .= '<div class="indentation"> </div>';
}
return $output;
@@ -2217,7 +2227,7 @@ function template_preprocess_page(&$variables) {
$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';
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 1695acef3eb6830174b9b904f9613c83fdbd7109..e2ebc934223ce7643e99f570ac996ef59ae2686f 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -85,7 +85,10 @@ function _theme_load_offline_registry($theme, $base_theme = NULL, $theme_engine
*
* @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 = '<h2 class="element-invisible">Installation tasks</h2>';
$output .= '<ol class="task-list">';
@@ -115,14 +118,13 @@ function theme_task_list($items, $active = NULL) {
*
* 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'] .= '<h3>' . $title . ':</h3>';
- $variables['messages'] .= theme('status_messages', 'error');
+ $variables['messages'] .= theme('status_messages', array('display' => 'error'));
$variables['content'] .= '<p>' . st('Please check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri())) . '</p>';
}
@@ -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'] .= '<h4>' . $title . ':</h4>';
- $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'] .= '<h4>' . $title . ':</h4>';
- $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, $show_messages = TRUE) {
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'] .= '<h4>' . $title . ':</h4>';
- $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
diff --git a/install.php b/install.php
index 2476e181aeba4524237a5aeb6404635ec322cde8..83c5099eeb75da954c065be58db269f44fd70533 100644
--- a/install.php
+++ b/install.php
@@ -679,9 +679,9 @@ function install_display_output($output, $install_state) {
// Let the theming function know when every step of the installation has
// been completed.
$active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task'];
- drupal_add_region_content('sidebar_first', theme_task_list(install_tasks_to_display($install_state), $active_task));
+ drupal_add_region_content('sidebar_first', theme('task_list', array('items' => install_tasks_to_display($install_state), 'active' => $active_task)));
}
- print theme($install_state['database_tables_exist'] ? 'maintenance_page' : 'install_page', $output);
+ print theme($install_state['database_tables_exist'] ? 'maintenance_page' : 'install_page', array('content' => $output));
exit;
}
@@ -708,7 +708,7 @@ function install_verify_requirements(&$install_state) {
if ($severity == REQUIREMENT_ERROR) {
if ($install_state['interactive']) {
drupal_set_title(st('Requirements problem'));
- $status_report = theme('status_report', $requirements);
+ $status_report = theme('status_report', array('requirements' => $requirements));
$status_report .= st('Check the error messages and <a href="!url">proceed with the installation</a>.', array('!url' => request_uri()));
return $status_report;
}
@@ -1025,7 +1025,8 @@ function install_select_profile(&$install_state) {
if ($install_state['interactive']) {
include_once DRUPAL_ROOT . '/includes/form.inc';
drupal_set_title(st('Select an installation profile'));
- return drupal_render(drupal_get_form('install_select_profile_form', $install_state['profiles']));
+ $form = drupal_get_form('install_select_profile_form', $install_state['profiles']);
+ return drupal_render($form);
}
else {
throw new Exception(install_no_profile_error());
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc
index b1fc85a8dfcb995111be201171e9e497511ad541..55c979b8ce921591d97575e72d8f88503e2c8e93 100644
--- a/modules/aggregator/aggregator.admin.inc
+++ b/modules/aggregator/aggregator.admin.inc
@@ -32,7 +32,7 @@ function aggregator_view() {
if (empty($rows)) {
$rows[] = array(array('data' => t('No feeds available. <a href="@link">Add feed</a>.', 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. <a href="@link">Add category</a>.', 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;
}
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 765f877e6ba02d6e9d1cce517c50692b792caa43..d8428f98d21377307d97ffb702a9ca9950496e7d 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -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 '<a href="' . check_url($item->link) . '">' . check_plain($item->title) . "</a>\n";
-
+ return '<a href="' . check_url($variables['item']->link) . '">' . check_plain($variables['item']->title) . "</a>\n";
}
/**
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc
index b34787f93171753f06c5c1484b9ea35e7b58a211..5690aa798ba9112a3e7bcc04c4aba6f108c10e04 100644
--- a/modules/aggregator/aggregator.pages.inc
+++ b/modules/aggregator/aggregator.pages.inc
@@ -37,7 +37,7 @@ function aggregator_page_source($arg1, $arg2 = NULL) {
// $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, $op, $feed_source = '') {
// 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($items, $feed_source = '') {
'#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_submit($form, &$form_state) {
/**
* 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_items($form) {
);
}
}
- $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_items($form) {
* @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 = NULL) {
}
$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 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
@@ -454,7 +466,7 @@ function theme_aggregator_page_opml($feeds) {
*/
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_summary_item(&$variables) {
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)));
diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc
index f5a49024129c792c9648f448318846bf359679a3..aa616569fb25d86705393a997042095b0c37022d 100644
--- a/modules/aggregator/aggregator.parser.inc
+++ b/modules/aggregator/aggregator.parser.inc
@@ -37,7 +37,7 @@ function aggregator_aggregator_parse($feed) {
}
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 = '';
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index f79634f292ea6dbfc4c8c166069066bbc689cda4..600a8d33f4198682715161c1ad6edbe477b3ab2f 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -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;
}
diff --git a/modules/blog/blog.pages.inc b/modules/blog/blog.pages.inc
index 1d3afd563a3cc9894b3c476d6d5d623bdd26dd1a..6936f54be839bb80808dc9575ed9cec7cac8cc97 100644
--- a/modules/blog/blog.pages.inc
+++ b/modules/blog/blog.pages.inc
@@ -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)));
diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc
index d1745473a261b1d53972273a5ca369b5e1ff5404..b6a7e9b5d561f18067095955293f2d188ee100df 100644
--- a/modules/book/book.admin.inc
+++ b/modules/book/book.admin.inc
@@ -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, &$form) {
* @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')));
}
diff --git a/modules/book/book.module b/modules/book/book.module
index eed90fbaa86c7ea5864d97098309bc15957e97bb..3adb4874105526dc7cb0fb738d0a9ef172896cc0 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -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 = '', $edit = array()) {
*
* @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_mode) {
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, $children = '') {
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));
}
/**
diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc
index 5909c5b58b7ca48e6473d91b5a17db922a40a25f..206f61b796dacca8680c6ef4c84eedb1bf84f311 100644
--- a/modules/book/book.pages.inc
+++ b/modules/book/book.pages.inc
@@ -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();
diff --git a/modules/color/color.module b/modules/color/color.module
index 67d7ba92236a3c18b5049e7644a7a0aec8c31e00..72d2037d0bb76d45144516cfb61477afdac5a6e1 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -60,7 +60,7 @@ function _color_theme_select_form_alter(&$form, &$form_state) {
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_state, $theme) {
*
* @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) . '/';
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 2cd5966e48f12906e22947b11e97649e938a905c..07e19c7a3df65c03ec0d54f4c7393b2094ef08fa 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -87,7 +87,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
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)),
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 8a8e43f94a8eec6936492ef4da1149b45ad9ee7d..a5f3a29993741f3a1cca3c7858670712b840f162 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -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_mode) {
);
}
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_mode) {
}
}
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_state, $comment) {
$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(&$variables) {
$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(&$variables) {
/**
* 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) {
diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc
index 3331b1a1a6425c8d415c6be96a2b616925cda52a..c0d2ca2985c545c053cc05d916cec355492a30b5 100644
--- a/modules/contact/contact.admin.inc
+++ b/modules/contact/contact.admin.inc
@@ -33,7 +33,7 @@ function contact_admin_categories() {
$rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a>.', array('@link' => url('admin/structure/contact/add'))), 'colspan' => 5));
}
- return theme('table', $header, $rows);
+ return theme('table', array('header' => $header, 'rows' => $rows));
}
/**
diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index 895fa4e3a4436a5241f759c30f53ae24c2ad18b7..a959146e680a26db0a7651cf94a3fd81d99fb903 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -177,11 +177,11 @@ function contact_personal_form($form, &$form_state, $recipient) {
$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'),
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 7f0547c56fbd862745dd71d68eb694d80422b5e8..c7d09a7b4162898e80405adbd15b027134eb654d 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -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),
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 3c3ef1cabf619bc44a824f05436bd7f1300307e4..7607c34b19c3ad4dde219ff5f82769caf9d8dddf 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -173,8 +173,10 @@ function dblog_form_system_logging_settings_alter(&$form, $form_state) {
*
* @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]);
}
diff --git a/modules/field/field.api.php b/modules/field/field.api.php
index 86c8da9246fe368b70ceef5fd7dd06ff50de34e8..461789a1bd989686a59d3df1f34a7d6622c0aa4e 100644
--- a/modules/field/field.api.php
+++ b/modules/field/field.api.php
@@ -778,21 +778,22 @@ function hook_field_formatter_info_alter(&$info) {
* 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.
- */
-function theme_field_formatter_FORMATTER_SINGLE($element) {
+ * @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($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_SINGLE($element) {
* (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.
- */
-function theme_field_formatter_FORMATTER_MULTIPLE($element) {
+ * @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($variables) {
+ $element = $variables['element'];
+
$items = array();
foreach (element_children($element) as $key) {
$items[$key] = $key .':'. $element[$key]['#item']['value'];
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index dea3f588cf223a485b8bb7c2e596cb8c782a61d6..11b065df462b5380faa3ea6530e44029c3082bc2 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -221,7 +221,8 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
* 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($element) {
}
$output = '<div class="form-item">';
- $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'] ? '<div class="description">' . $element['#description'] . '</div>' : '';
$output .= '<div class="clearfix">' . drupal_render($add_more_button) . '</div>';
$output .= '</div>';
diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module
index 119cc9fea44d4f649c16a197ab4bc56debe639f8..a87c146a525240b3c46b234845109c8a8ee03612 100644
--- a/modules/field/modules/list/list.module
+++ b/modules/field/modules/list/list.module
@@ -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_default($element) {
/**
* 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'];
}
diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index a7c79ec3c2c75192e50b1b1e5ed0ef26cb671ef9..3d3b0c845c1059785cb4c75c0f880ed5bba12703 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -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($element, &$form_state) {
* 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'];
}
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index b9ec74173caf81bc67e6b501a2ddcabb50021986..53bec62c76ea74b19726b982de3cb5f35d7a7fa0 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -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, $instance) {
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, $instance) {
* 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
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index cc0245dee93508cac2f8774678831b2e6974facd..4a88b1e3a1226fd282c74409084f690affa77c8b 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -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_trimmed($element) {
* 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_text_value($form, $edit = FALSE) {
*
* 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'];
}
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 6d2f8d7da3db4254ba42b18e0cd84d76c58b742b..f48e03db51a97bdf70e9f28804575519118a424b 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -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($bundle) {
'%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');
}
}
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 1e6ad8d4be093c92b106bda8815b38ceab01a050..1687e834ee5c069f2e819b60f1656ec6e706fdb8 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -523,7 +523,7 @@ function file_field_widget(&$form, &$form_state, $field, $instance, $langcode, $
// 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, &$form_state, $field, $instance, $langcode, $
// 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_multiple($element, &$form_state, $form) {
/**
* 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 .= '<div class="file-widget form-managed-file clearfix">';
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($element) {
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($element) {
/**
* 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($description, $upload_validators) {
/**
* 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));
}
diff --git a/modules/file/file.module b/modules/file/file.module
index b804b1a4fd7e6f66ff7fcea7b144c2c1ef13301b..e62e960e463c2859270a138fecb73ff0c17d8b30 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -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($element, &$form_state, $form) {
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($element) {
/**
* 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 .= '<div class="form-managed-file">';
@@ -589,12 +591,15 @@ function theme_file_managed_file($element) {
/**
* 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 '<img class="file-icon" alt="" title="' . $mime . '" src="' . $icon_url . '" />';
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 2044102e0fe7d031590b3eb306ec32243bfb1db4..f3705079534a2fc57df930d3ee197727da331cfb 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -304,7 +304,7 @@ class FileFieldDisplayTestCase extends FileFieldTestCase {
// 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.
diff --git a/modules/filter/filter.admin.inc b/modules/filter/filter.admin.inc
index 34da3c141c8d0bbcc037b66b027c4c89fd2208bf..f333749d138a6261dc840716f18dfc12f8bdeed9 100644
--- a/modules/filter/filter.admin.inc
+++ b/modules/filter/filter.admin.inc
@@ -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($form, &$form_state) {
*
* @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($form) {
);
}
$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, &$form_state, $format) {
// 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 = '<p>' . t('No guidelines available.') . '</p>';
}
@@ -342,7 +344,9 @@ function filter_admin_order($form, &$form_state, $format = NULL) {
*
* @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);
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index b5da0aa66253a50faad85c32854a4e31ca60b81a..017ad74aeff9d0cb50de5894a242bc74fb48e1ce 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -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, $format, $long = FALSE) {
);
}
}
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
$output .= '<p>' . t('Most unusual characters can be directly entered without any problems.') . '</p>';
$output .= '<p>' . t('If you do encounter problems, try using HTML character entities. A common example looks like &amp; for an ampersand & character. For a full list of entities see HTML\'s <a href="@html-entities">entities</a> page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '</p>';
@@ -391,7 +391,7 @@ function _filter_html_tips($filter, $format, $long = FALSE) {
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 = NULL, $weight = NULL, $parents = array('
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) ? '<label>' . $format->name . ':</label>' : '';
- return '<div id="filter-guidelines-' . $format->format . '" class="filter-guidelines-item">' . $name . theme('filter_tips', _filter_tips($format->format, FALSE)) . '</div>';
+ return '<div id="filter-guidelines-' . $format->format . '" class="filter-guidelines-item">' . $name . theme('filter_tips', array('tips' => _filter_tips($format->format, FALSE))) . '</div>';
}
/**
diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc
index c7b7982c0bcfca8b00c983738643a684fd12f302..a82153558e48030d6e078151276b1595393b206a 100644
--- a/modules/filter/filter.pages.inc
+++ b/modules/filter/filter.pages.inc
@@ -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;
diff --git a/modules/forum/forum-icon.tpl.php b/modules/forum/forum-icon.tpl.php
index 7f5d007d76089f6445baef159a2ac80f1e70d300..9e8c653a88d269856954d52b5cace935b0f57288 100644
--- a/modules/forum/forum-icon.tpl.php
+++ b/modules/forum/forum-icon.tpl.php
@@ -18,7 +18,7 @@
<a id="new">
<?php endif; ?>
-<?php print theme('image', "misc/forum-$icon.png") ?>
+<?php print theme('image', array('path' => "misc/forum-$icon.png")) ?>
<?php if ($new_posts): ?>
</a>
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 71763191b81cfc51a0e4da11084782e8caddb93d..1d494b2ebdf7623e8fa2e11a148e989961ae397b 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -596,7 +596,7 @@ function forum_block_view_pre_render($elements) {
$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(&$variables) {
$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) {
}
$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_list(&$variables) {
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_list(&$variables) {
$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_list(&$variables) {
$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(&$variables) {
* @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) : '';
}
diff --git a/modules/forum/forum.pages.inc b/modules/forum/forum.pages.inc
index d1fa160c8a5ef12be002b26d7c1a0154b2250a19..6b01048da1a35167ebb1bcd982f020166afa4b04 100644
--- a/modules/forum/forum.pages.inc
+++ b/modules/forum/forum.pages.inc
@@ -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));
}
diff --git a/modules/forum/forums.tpl.php b/modules/forum/forums.tpl.php
index d9a0506c69995c645cfa1cb74f003588fba0d569..0db6c4d48cbe9c9673043a0ecc567f3daacd7f2b 100644
--- a/modules/forum/forums.tpl.php
+++ b/modules/forum/forums.tpl.php
@@ -20,7 +20,7 @@
?>
<?php if ($forums_defined): ?>
<div id="forum">
- <?php print theme('links', $links); ?>
+ <?php print theme('links', array('links' => $links)); ?>
<?php print $forums; ?>
<?php print $topics; ?>
</div>
diff --git a/modules/help/help.admin.inc b/modules/help/help.admin.inc
index 3de153de6356cb6d93281e7bd1d0b6d8d0a7b33e..cb4411f1c9931f1430fa1630f926b99894fadd3f 100644
--- a/modules/help/help.admin.inc
+++ b/modules/help/help.admin.inc
@@ -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']))));
}
}
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc
index 559d954b9e4b4717da1e8eb8e25f25f05ba1f5cb..5028279bb96cf38c12c335175c568092006f8d44 100644
--- a/modules/image/image.admin.inc
+++ b/modules/image/image.admin.inc
@@ -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_state, $style) {
'#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_state, $style) {
$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($style) {
$output .= '<div class="preview-image-wrapper">';
$output .= t('original') . ' (' . l(t('view actual size'), $original_path) . ')';
$output .= '<div class="preview-image original-image" style="' . $original_attributes['style'] . '">';
- $output .= '<a href="' . url($original_path) . '?' . time() . '">' . theme('image', $original_path . '?' . time(), t('Sample original image'), '', $original_attributes, FALSE) . '</a>';
+ $output .= '<a href="' . url($original_path) . '?' . time() . '">' . theme('image', array('path' => $original_path . '?' . time(), 'alt' => t('Sample original image'), 'title' => '', 'attributes' => $original_attributes, 'getsize' => FALSE)) . '</a>';
$output .= '<div class="height" style="height: ' . $original_height . 'px"><span>' . $original_image['height'] . 'px</span></div>';
$output .= '<div class="width" style="width: ' . $original_width . 'px"><span>' . $original_image['width'] . 'px</span></div>';
$output .= '</div>'; // End preview-image.
@@ -700,7 +712,7 @@ function theme_image_style_preview($style) {
$output .= '<div class="preview-image-wrapper">';
$output .= check_plain($style['name']) . ' (' . l(t('view actual size'), file_create_url($preview_file) . '?' . time()) . ')';
$output .= '<div class="preview-image modified-image" style="' . $preview_attributes['style'] . '">';
- $output .= '<a href="' . file_create_url($preview_file) . '?' . time() . '">' . theme('image', file_create_url($preview_file) . '?' . time(), t('Sample modified image'), '', $preview_attributes, FALSE) . '</a>';
+ $output .= '<a href="' . file_create_url($preview_file) . '?' . time() . '">' . theme('image', array('path' => file_create_url($preview_file) . '?' . time(), 'alt' => t('Sample modified image'), 'title' => '', 'attributes' => $preview_attributes, 'getsize' => FALSE)) . '</a>';
$output .= '<div class="height" style="height: ' . $preview_height . 'px"><span>' . $preview_image['height'] . 'px</span></div>';
$output .= '<div class="width" style="width: ' . $preview_width . 'px"><span>' . $preview_image['width'] . 'px</span></div>';
$output .= '</div>'; // End preview-image.
@@ -714,11 +726,15 @@ function theme_image_style_preview($style) {
/**
* 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($data) {
/**
* 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']));
}
diff --git a/modules/image/image.module b/modules/image/image.module
index 603c336b1417921e5a6ca9ee37a8b7b1061bfe65..bb28304071e5e0997a9d20442dd9879ac488dff6 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -20,7 +20,7 @@ function image_help($path, $arg) {
$output .= '<h3>' . t('Image styles') . '</h3>';
$output .= '<p>' . t('Image <em>styles</em> 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.') .'</p>';
$output .= '<p>' . 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:') . '</p>';
- $output .= theme('item_list', $naming_approaches);
+ $output .= theme('item_list', array('items' => $naming_approaches));
$output .= '<p>' . t('Both approaches are common and which you choose depends on how you use the image style.') . '</p>';
$output .= '<p>' . t('After creating an image style, <em>effects</em> may be added to the style. Image module comes with some basic effects such as <em>crop</em>, <em>scale</em>, <em>desaturate</em>, and <em>rotate</em>. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the <em>crop and scale</em> effect and the <em>desaturate</em> 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, $effect) {
/**
* 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, $path, $alt = '', $title = '', $attribut
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);
}
/**
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index c2a58917c30b68cbc9127d90729d58fd5e91c9ff..f6968c093a9a4c9b2e98fe2ca83cfc05a7a4ba76 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -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]);
}
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index d9bb754b7ef57ebcbaacc5e1726a00bc4c8d643a..cc9b873d68b464dc30a6a45ed0792418707fd3ed 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -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 .= '<div class="description">' . filter_xss_admin($description) . '</div>';
+function theme_menu_admin_overview($variables) {
+ $output = check_plain($variables['title']);
+ $output .= '<div class="description">' . filter_xss_admin($variables['description']) . '</div>';
return $output;
}
@@ -186,7 +186,9 @@ function menu_overview_form_submit($form, &$form_state) {
*
* @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;
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index ccbd5fe0724dd79ca5a9418e866000ee5754437a..4634d62e5380dc5a7a808c1f08b5e597d0a8f767 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -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 .= ' <small> (Machine name: ' . check_plain($type->type) . ')</small>';
$output .= '<div class="description">' . filter_xss_admin($type->description) . '</div>';
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 618f0b25cfc13e12eed2b97cc3f0bed79fa9b771..2fd2a54a5f6a67992fa76a81b254411645c9c706 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -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 .= '<div id="node-admin-filter">';
$output .= drupal_render($form['filters']);
$output .= '</div>';
@@ -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 .= '<ul class="clearfix">';
if (!empty($form['current'])) {
foreach (element_children($form['current']) as $key) {
@@ -358,7 +362,7 @@ function _node_mass_update_batch_finished($success, $results, $operations) {
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_state) {
// 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';
@@ -443,9 +447,9 @@ function node_admin_nodes() {
foreach ($result as $node) {
$l_options = empty($node->language) ? array() : array('language' => $languages[$node->language]);
$options[$node->nid] = array(
- 'title' => l($node->title, 'node/' . $node->nid, $l_options) . ' ' . theme('mark', node_mark($node->nid, $node->changed)),
+ 'title' => l($node->title, 'node/' . $node->nid, $l_options) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
'type' => check_plain(node_type_get_name($node)),
- 'author' => theme('username', $node),
+ 'author' => theme('username', array('account' => $node)),
'status' => $node->status ? t('published') : t('not published'),
'changed' => format_date($node->changed, 'short'),
);
@@ -460,7 +464,7 @@ function node_admin_nodes() {
'#options' => $options,
'#empty' => t('No content available.'),
);
- $form['pager'] = array('#markup' => theme('pager', NULL));
+ $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL)));
return $form;
}
diff --git a/modules/node/node.module b/modules/node/node.module
index 2933e7599f8d4a78fd496ed4148294410e48336e..adec8fc2c3a202a14f9ec658fd6362ab7912d5df 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -270,7 +270,7 @@ function node_title_list($result, $title = NULL) {
$num_rows = TRUE;
}
- return $num_rows ? theme('node_list', $items, $title) : FALSE;
+ return $num_rows ? theme('node_list', array('items' => $items, 'title' => $title)) : FALSE;
}
/**
@@ -278,8 +278,8 @@ function node_title_list($result, $title = NULL) {
*
* @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);
}
/**
@@ -1162,7 +1162,7 @@ function template_preprocess_node(&$variables) {
$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();
@@ -1185,7 +1185,7 @@ function template_preprocess_node(&$variables) {
// 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;
@@ -1220,8 +1220,8 @@ function template_preprocess_node(&$variables) {
*
* @ingroup themeable
*/
-function theme_node_log_message($log) {
- return '<div class="log"><div class="title">' . t('Log') . ':</div>' . $log . '</div>';
+function theme_node_log_message($variables) {
+ return '<div class="log"><div class="title">' . t('Log') . ':</div>' . $variables['log'] . '</div>';
}
/**
@@ -1411,7 +1411,7 @@ function node_search_execute($keys = NULL) {
'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,
@@ -1520,7 +1520,9 @@ function node_user_cancel($edit, $account, $method) {
*
* @ingroup themeable
*/
-function theme_node_search_admin($form) {
+function theme_node_search_admin($variables) {
+ $form = $variables['form'];
+
$output = drupal_render($form['info']);
$header = array(t('Factor'), t('Weight'));
@@ -1531,7 +1533,7 @@ function theme_node_search_admin($form) {
$row[] = drupal_render($form['factors'][$key]);
$rows[] = $row;
}
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
$output .= drupal_render_children($form);
return $output;
@@ -1819,7 +1821,7 @@ function node_block_info() {
*/
function node_block_view($delta = '') {
$block['subject'] = t('Syndicate');
- $block['content'] = theme('feed_icon', url('rss.xml'), t('Syndicate'));
+ $block['content'] = theme('feed_icon', array('url' => url('rss.xml'), 'title' => t('Syndicate')));
return $block;
}
@@ -1967,7 +1969,7 @@ function node_page_default() {
$default_links[] = l(t('Change the default front page'), 'admin/config/system/site-information');
}
if (!empty($default_links)) {
- $default_message .= theme('item_list', $default_links);
+ $default_message .= theme('item_list', array('items' => $default_links));
}
$build['default_message'] = array(
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 82b6c9628e4060e17122a3970119a740b15b3b88..bd59747df114a29b0152b5f31f9805678eeca8d6 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -24,7 +24,7 @@ function node_add_page() {
$item = array_shift($content);
drupal_goto($item['href']);
}
- return theme('node_add_list', $content);
+ return theme('node_add_list', array('content' => $content));
}
/**
@@ -32,7 +32,8 @@ function node_add_page() {
*
* @ingroup themeable
*/
-function theme_node_add_list($content) {
+function theme_node_add_list($variables) {
+ $content = $variables['content'];
$output = '';
if ($content) {
@@ -318,7 +319,9 @@ function node_form_build_preview($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_node_form($form) {
+function theme_node_form($variables) {
+ $form = $variables['form'];
+
$output = "\n<div class=\"node-form\">\n";
$output .= " <div class=\"standard\">\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 = '<div class="preview">';
$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 != '') ? '<p class="revision-log">' . filter_xss($revision->log) . '</p>' : ''),
'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 != '') ? '<p class="revision-log">' . filter_xss($revision->log) . '</p>' : '');
if ($revert_permission) {
$operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 40520edd4aafd035fac063709dc0f31d0b93f5bf..697f4db5f9975d15728560306b43380e8a84135d 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -107,7 +107,7 @@ function _openid_user_login_form_alter(&$form, &$form_state) {
);
$form['openid_links'] = array(
- '#markup' => theme('item_list', $items),
+ '#markup' => theme('item_list', array('items' => $items)),
'#weight' => 1,
);
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 744a282a227bbd5295827ac5deff27780d2ed85b..985ddc1180cedf8b13421f4b2fbc2e8e6921bf14 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -744,11 +744,11 @@ function poll_view_results($node, $build_mode, $block = FALSE) {
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_mode, $block = FALSE) {
*
* @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']));
}
diff --git a/modules/poll/poll.pages.inc b/modules/poll/poll.pages.inc
index 1db25762023e5fd669b376e483e86088ae4e0318..80cb244792b85051afa1959c7592317e8753540f 100644
--- a/modules/poll/poll.pages.inc
+++ b/modules/poll/poll.pages.inc
@@ -42,7 +42,7 @@ function poll_page() {
$output .= '<li>' . l($node->title, "node/$node->nid") . ' - ' . format_plural($node->votes, '1 vote', '@count votes') . ' - ' . ($node->active ? t('open') : t('closed')) . '</li>';
}
$output .= '</ul>';
- $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.'),
);
diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc
index a9303e6e747e01c1d41f8c0cdfd4fdce98bb24c7..227e108818b355b9e1a891c135c238a555a7631f 100644
--- a/modules/profile/profile.admin.inc
+++ b/modules/profile/profile.admin.inc
@@ -95,7 +95,9 @@ function profile_admin_overview_submit($form, &$form_state) {
* @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($form) {
}
$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;
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index da9b34f0bd70e84078b64f7eae527d3e7a9b7056..2ff780480a0043d4994f56e7fa75f741ae2c464c 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -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($account, $category) {
*/
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_block(&$variables) {
*/
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) {
diff --git a/modules/profile/profile.pages.inc b/modules/profile/profile.pages.inc
index 300e57cae64534a1040ee302cffa40f04fe40da3..8c60c68f779b93442b83cba1abd04980788f8337 100644
--- a/modules/profile/profile.pages.inc
+++ b/modules/profile/profile.pages.inc
@@ -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;
diff --git a/modules/search/search.api.php b/modules/search/search.api.php
index f7c7f2d7fd4e569d61359b9d8b56d8e8d983141a..0cfb1a1e6887b2e640e4e01f5921d4e5777d2aa3 100644
--- a/modules/search/search.api.php
+++ b/modules/search/search.api.php
@@ -192,7 +192,7 @@ function hook_search_execute($keys = NULL) {
'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,
diff --git a/modules/search/search.module b/modules/search/search.module
index 9d15edb5e448e24bca276c40087474618149d802..4108e5c5c9aa1cd7a40d3275622a0d89a9420d86 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -965,7 +965,7 @@ function search_data($keys = NULL, $type = 'node') {
return module_invoke($type, 'search_page', $results);
}
else {
- return theme('search_results', $results, $type);
+ return theme('search_results', array('results' => $results, 'type' => $type));
}
}
}
diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc
index cdac3350f01a57be864fb77f3fd2e598b30e48b8..f0035e0c27943a96f2fa1982f07dfd970fd476a0 100644
--- a/modules/search/search.pages.inc
+++ b/modules/search/search.pages.inc
@@ -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 = '<h2 class="title">' . $title . '</h2><div>' . $content . '</div>';
+function theme_search_results_listing($variables) {
+ $output = '<h2 class="title">' . $variables['title'] . '</h2><div>' . $variables['content'] . '</div>';
return $output;
}
@@ -73,9 +74,9 @@ function theme_search_results_listing($title, $content) {
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'];
}
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 234ecb89ddf74e9c2c98b55d34eee412f1036691..5a6cd411ed2b6f3efc0329cfa709fe02548fe389 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -209,7 +209,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
}
$context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
$context['message'] .= '<div class="simpletest-' . ($test_results['#fail'] + $test_results['#exception'] ? 'fail' : 'pass') . '">Overall results: ' . _simpletest_format_summary_line($test_results) . '</div>';
- $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;
diff --git a/modules/simpletest/simpletest.pages.inc b/modules/simpletest/simpletest.pages.inc
index cb5ccfefc0404688c6260b49adce3123514b4c2d..5ba188f66be83c64b22093b7a6e6ef84bf5cb314 100644
--- a/modules/simpletest/simpletest.pages.inc
+++ b/modules/simpletest/simpletest.pages.inc
@@ -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($table) {
// 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($table) {
$test['#name'] = $test_name;
$row[] = drupal_render($test);
- $row[] = theme('indentation', 1) . '<label for="edit-' . $test_name . '">' . $title . '</label>';
+ $row[] = theme('indentation', array('size' => 1)) . '<label for="edit-' . $test_name . '">' . $title . '</label>';
$row[] = '<div class="description">' . $description . '</div>';
$rows[] = array('data' => $row, 'class' => array($test_class . '-test', ($collapsed ? 'js-hide' : '')));
@@ -156,7 +162,7 @@ function theme_simpletest_test_table($table) {
return '<strong>' . t('No tests to display.') . '</strong>';
}
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($form, &$form_state) {
*
* @return HTML output.
*/
-function theme_simpletest_result_summary($form) {
+function theme_simpletest_result_summary($variables) {
+ $form = $variables['form'];
return '<div class="simpletest-' . ($form['#ok'] ? 'pass' : 'fail') . '">' . _simpletest_format_summary_line($form) . '</div>';
}
@@ -398,10 +405,10 @@ function simpletest_result_status_image($status) {
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])) {
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index e94f72811ca64fca9b7c79e31d82f9f87aed3408..f7abf51b694aa0f3aa558e24ab7271161bff428c 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -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'];
}
/**
diff --git a/modules/simpletest/tests/field_test.module b/modules/simpletest/tests/field_test.module
index 6d463daeee80c94e084d14adecfa6a40fc8c58dc..6bd73c2509215e3168c507d80663d8d857cab962 100644
--- a/modules/simpletest/tests/field_test.module
+++ b/modules/simpletest/tests/field_test.module
@@ -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_test_default($element) {
/**
* 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();
diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test
index 29fc445c7ac03acd04f161d24f6129bbd565642a..56860bd135c313538c8669276fb9694aed43146e 100644
--- a/modules/simpletest/tests/theme.test
+++ b/modules/simpletest/tests/theme.test
@@ -70,7 +70,7 @@ class ThemeTableUnitTest extends DrupalWebTestCase {
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 DrupalWebTestCase {
$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.'));
diff --git a/modules/statistics/statistics.admin.inc b/modules/statistics/statistics.admin.inc
index 70137a7bbd9e6317fde9f0457a12afc66baed20d..d9367743fdfd317413f2e017c9151f78f85cd28b 100644
--- a/modules/statistics/statistics.admin.inc
+++ b/modules/statistics/statistics.admin.inc
@@ -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),
diff --git a/modules/statistics/statistics.pages.inc b/modules/statistics/statistics.pages.inc
index 5d5e799da8e133d129bd623cde8a3c31dae2ea16..b58f1db53c94eda0ae1cf2ab58298a01c69eff4b 100644
--- a/modules/statistics/statistics.pages.inc
+++ b/modules/statistics/statistics.pages.inc
@@ -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"),
);
}
diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module
index 224763b2c155c5c22a591485a1fbfe605042f3ee..11b991da155f957ca38fee18bff5f9b85d627dd4 100644
--- a/modules/syslog/syslog.module
+++ b/modules/syslog/syslog.module
@@ -77,7 +77,7 @@ function syslog_watchdog(array $log_entry) {
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;
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index c7c0d55268ada49e79d7a3109c7f8e679abe44ca..2c4c8887e8d34127f1670bba5f1a3fe0f53814d3 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -92,7 +92,7 @@
<?php if ($main_menu): ?>
<div id="navigation"><div class="section">
- <?php print theme('links', $main_menu, array('id' => 'main-menu', 'class' => array('links', 'clearfix')), t('Main menu')); ?>
+ <?php print theme('links', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
</div></div> <!-- /.section, /#navigation -->
<?php endif; ?>
@@ -129,7 +129,7 @@
</div></div> <!-- /#main, /#main-wrapper -->
<div id="footer"><div class="section">
- <?php print theme('links', $secondary_menu, array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), t('Secondary menu')); ?>
+ <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
<?php print render($page['footer']); ?>
</div></div> <!-- /.section, /#footer -->
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index b7537b7a8dfad3082fc1776ae7c845a7144d8dcf..f2c278f77cc1ab07338a626a4d6e12a03a8b9e7a 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -56,7 +56,7 @@ function system_main_admin_page($arg = NULL) {
}
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 = NULL) {
}
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_state = array()) {
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, $extra) {
}
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($modules, $storage) {
);
$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_confirm_form($storage) {
if (isset($uninstall)) {
$form['#confirmed'] = TRUE;
$form['uninstall']['#tree'] = TRUE;
- $form['modules'] = array('#markup' => '<p>' . t('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>' . theme('item_list', $uninstall));
+ $form['modules'] = array('#markup' => '<p>' . t('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>' . 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 @@ function theme_admin_block($block) {
/**
* 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($content) {
/**
* 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($menu_items) {
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($menu_items) {
/**
* 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 = '<table class="system-status-report">';
foreach ($requirements as $requirement) {
@@ -2149,11 +2169,15 @@ function theme_status_report($requirements) {
/**
* 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($form) {
$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 '<div class="incompatible">' . $message . '</div>';
+function theme_system_modules_incompatible($variables) {
+ return '<div class="incompatible">' . $variables['message'] . '</div>';
}
/**
* Themes a table of currently disabled modules.
*
* @ingroup themeable
- * @param $form
- * The form array representing the currently disabled modules.
+ *
+ * @param $variables
+ * An associative array containing:
+ * - form: The form array representing the currently disabled modules.
+ *
* @return
* An HTML string representing the table.
*/
-function theme_system_modules_uninstall($form) {
+function theme_system_modules_uninstall($variables) {
+ $form = $variables['form'];
+
// No theming for the confirm form.
if (isset($form['confirm'])) {
return drupal_render($form);
@@ -2240,7 +2272,7 @@ function theme_system_modules_uninstall($form) {
$rows[] = array(array('data' => t('No modules are available to uninstall.'), 'colspan' => '3', 'align' => 'center', 'class' => array('message')));
}
- $output = theme('table', $header, $rows);
+ $output = theme('table', array('header' => $header, 'rows' => $rows));
$output .= drupal_render_children($form);
return $output;
@@ -2249,11 +2281,15 @@ function theme_system_modules_uninstall($form) {
/**
* Theme function for the system themes 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_themes_form($form) {
+function theme_system_themes_form($variables) {
+ $form = $variables['form'];
+
foreach (element_children($form) as $key) {
// Only look for themes
if (!isset($form[$key]['info'])) {
@@ -2267,12 +2303,12 @@ function theme_system_themes_form($form) {
// Make sure it is compatible and render the checkbox if so.
if (isset($form['status']['#incompatible_themes_core'][$key])) {
unset($form['status'][$key]);
- $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of Drupal core'));
+ $status = theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('incompatible'), 'title' => t('Incompatible with this version of Drupal core')));
$description .= '<div class="incompatible">' . t('This version is incompatible with the !core_version version of Drupal core.', array('!core_version' => VERSION)) . '</div>';
}
elseif (isset($form['status']['#incompatible_themes_php'][$key])) {
unset($form['status'][$key]);
- $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of PHP'));
+ $status = theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('incompatible'), 'title' => t('Incompatible with this version of PHP')));
$php_required = $form['status']['#incompatible_themes_php'][$key];
if (substr_count($php_required, '.') < 2) {
$php_required .= '.*';
@@ -2300,7 +2336,7 @@ function theme_system_themes_form($form) {
}
$header = array(t('Screenshot'), t('Name'), t('Version'), t('Enabled'), t('Default'), t('Operations'));
- $output = theme('table', $header, $rows);
+ $output = theme('table', array('header' => $header, 'rows' => $rows));
$output .= drupal_render_children($form);
return $output;
}
@@ -2348,12 +2384,12 @@ function system_actions_manage() {
}
if ($row) {
- $pager = theme('pager', NULL);
+ $pager = theme('pager', array('tags' => NULL));
if (!empty($pager)) {
$row[] = array(array('data' => $pager, 'colspan' => '3'));
}
$build['system_actions_header'] = array('#markup' => '<h3>' . t('Actions available to Drupal:') . '</h3>');
- $build['system_actions_table'] = array('#markup' => theme('table', $header, $row));
+ $build['system_actions_table'] = array('#markup' => theme('table', array('header' => $header, 'rows' => $row)));
}
if ($actions_map) {
diff --git a/modules/system/system.module b/modules/system/system.module
index 4464e6c54a4fdaa50ab481eac3e3a21a1ae49fe4..c3477faf7530c0d7e72797253f64c19b2c8fb7ea 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1465,10 +1465,10 @@ function system_preprocess_page(&$variables) {
list($version, ) = explode('.', VERSION);
// Emit the META tag in the HTML HEAD section
- theme('meta_generator_html', $version);
+ theme('meta_generator_html', array('version' => $version));
// Emit the HTTP Header too
- theme('meta_generator_header', $version);
+ theme('meta_generator_header', array('version' => $version));
$variables['head'] = drupal_get_html_head();
}
@@ -1592,7 +1592,7 @@ function system_block_configure($delta = '') {
$form['wrapper']['preview'] = array(
'#type' => 'item',
'#title' => 'Preview',
- '#markup' => theme('image', $image_path, t('Powered by Drupal, an open source content management system'), t('Powered by Drupal, an open source content management system'), array('class' => array('powered-by-preview')), FALSE),
+ '#markup' => theme('image', array('path' => $image_path, 'alt' => t('Powered by Drupal, an open source content management system'), 'title' => t('Powered by Drupal, an open source content management system'), 'attributes' => array('class' => array('powered-by-preview')), 'getsize' => FALSE)),
);
return $form;
}
@@ -1625,7 +1625,7 @@ function system_block_view($delta = '') {
case 'powered-by':
$image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
$block['subject'] = NULL;
- $block['content'] = theme('system_powered_by', $image_path);
+ $block['content'] = theme('system_powered_by', array('image_path' => $image_path));
return $block;
case 'help':
$block['subject'] = NULL;
@@ -2691,8 +2691,8 @@ function system_timezone($abbreviation = '', $offset = -1, $is_daylight_saving_t
*
* @ingroup themeable
*/
-function theme_system_powered_by($image_path) {
- $image = theme('image', $image_path, t('Powered by Drupal, an open source content management system'), t('Powered by Drupal, an open source content management system'));
+function theme_system_powered_by($variables) {
+ $image = theme('image', array('path' => $variables['image_path'], 'alt' => t('Powered by Drupal, an open source content management system'), 'title' => t('Powered by Drupal, an open source content management system')));
return l($image, 'http://drupal.org', array('html' => TRUE, 'absolute' => TRUE, 'external' => TRUE));
}
@@ -2719,8 +2719,8 @@ function theme_system_compact_link() {
*
* @ingroup themeable
*/
-function theme_meta_generator_html($version = VERSION) {
- drupal_add_html_head('<meta name="Generator" content="Drupal ' . $version . ' (http://drupal.org)" />');
+function theme_meta_generator_html($variables) {
+ drupal_add_html_head('<meta name="Generator" content="Drupal ' . $variables['version'] . ' (http://drupal.org)" />');
}
/**
@@ -2728,8 +2728,8 @@ function theme_meta_generator_html($version = VERSION) {
*
* @ingroup themeable
*/
-function theme_meta_generator_header($version = VERSION) {
- drupal_add_http_header('X-Generator', 'Drupal ' . $version . ' (http://drupal.org)');
+function theme_meta_generator_header($variables) {
+ drupal_add_http_header('X-Generator', 'Drupal ' . $variables['version'] . ' (http://drupal.org)');
}
/**
@@ -2798,7 +2798,7 @@ function system_page_build(&$page) {
),
),
// Trigger cron run for clients not supporting JavaScript (fall-back).
- '#markup' => theme('system_run_cron_image', 'system/run-cron-image'),
+ '#markup' => theme('system_run_cron_image', array('image_path' => 'system/run-cron-image')),
);
}
@@ -2893,7 +2893,7 @@ function system_run_cron_image_access() {
* @see system_run_cron_image()
* @ingroup themeable
*/
-function theme_system_run_cron_image($image_path) {
- return '<noscript><div id="system-cron-image">' . theme('image', $image_path, '', '', array(), FALSE) . '</div></noscript>';
+function theme_system_run_cron_image($variables) {
+ return '<noscript><div id="system-cron-image">' . theme('image', array('path' => $variables['image_path'], 'getsize' => FALSE)) . '</div></noscript>';
}
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index edd021980640cd26eb9383a79a9687c3b623975f..a8e51837e51b0ef0c48d3b31d90a6a4e8d2f42a2 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -56,7 +56,9 @@ function taxonomy_overview_vocabularies_submit($form, &$form_state) {
* @ingroup themeable
* @see taxonomy_overview_vocabularies()
*/
-function theme_taxonomy_overview_vocabularies($form) {
+function theme_taxonomy_overview_vocabularies($variables) {
+ $form = $variables['form'];
+
$rows = array();
foreach (element_children($form) as $key) {
@@ -86,7 +88,7 @@ function theme_taxonomy_overview_vocabularies($form) {
drupal_add_tabledrag('taxonomy', 'order', 'sibling', 'vocabulary-weight');
}
$header[] = array('data' => t('Operations'), 'colspan' => '3');
- return theme('table', $header, $rows, array('id' => 'taxonomy')) . drupal_render_children($form);
+ return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'taxonomy'))) . drupal_render_children($form);
}
/**
@@ -507,7 +509,9 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
* @ingroup themeable
* @see taxonomy_overview_terms()
*/
-function theme_taxonomy_overview_terms($form) {
+function theme_taxonomy_overview_terms($variables) {
+ $form = $variables['form'];
+
$page_increment = $form['#page_increment'];
$page_entries = $form['#page_entries'];
$back_peddle = $form['#back_peddle'];
@@ -529,7 +533,7 @@ function theme_taxonomy_overview_terms($form) {
$term = &$form[$key];
$row = array();
- $row[] = (isset($term['#term']['depth']) && $term['#term']['depth'] > 0 ? theme('indentation', $term['#term']['depth']) : '') . drupal_render($term['view']);
+ $row[] = (isset($term['#term']['depth']) && $term['#term']['depth'] > 0 ? theme('indentation', array('size' => $term['#term']['depth'])) : ''). drupal_render($term['view']);
if ($form['#parent_fields']) {
$term['tid']['#attributes']['class'] = array('term-id');
$term['parent']['#attributes']['class'] = array('term-parent');
@@ -579,9 +583,9 @@ function theme_taxonomy_overview_terms($form) {
}
$header = array(t('Name'), t('Operations'));
- $output = theme('table', $header, $rows, array('id' => 'taxonomy'));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'taxonomy')));
$output .= drupal_render_children($form);
- $output .= theme('pager', NULL);
+ $output .= theme('pager', array('tags' => NULL));
return $output;
}
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index dd9b4792cdb2d2406d7272cdd6481179359bd23e..d7650ae9f22dced6fb6f1f8acaf143f482fd7115 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1002,8 +1002,8 @@ function _taxonomy_term_select($title, $value, $vocabulary_id, $description, $bl
*
* @ingroup themeable
*/
-function theme_taxonomy_term_select($element) {
- return theme('select', $element);
+function theme_taxonomy_term_select($variables) {
+ return theme('select', $variables['element']);
}
/**
@@ -1219,16 +1219,16 @@ function taxonomy_field_formatter_info() {
/**
* Theme function for 'link' term field formatter.
*/
-function theme_field_formatter_taxonomy_term_link($element) {
- $term = $element['#item']['taxonomy_term'];
+function theme_field_formatter_taxonomy_term_link($variables) {
+ $term = $variables['element']['#item']['taxonomy_term'];
return l($term->name, taxonomy_term_path($term));
}
/**
* Theme function for 'plain' term field formatter.
*/
-function theme_field_formatter_taxonomy_term_plain($element) {
- $term = $element['#item']['taxonomy_term'];
+function theme_field_formatter_taxonomy_term_plain($variables) {
+ $term = $variables['element']['#item']['taxonomy_term'];
return $term->name;
}
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index 88c0d829d680b7e9f0c3a99ded8948ae0fc315bd..35c0d09beef43e0552e6bf676715e5959c97b83b 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -44,7 +44,7 @@ function taxonomy_term_page($term) {
$nodes = node_load_multiple($nids);
$build += node_build_multiple($nodes);
$build['pager'] = array(
- '#markup' => theme('pager', NULL),
+ '#markup' => theme('pager', array('tags' => NULL)),
'#weight' => 5,
);
}
diff --git a/modules/tracker/tracker.pages.inc b/modules/tracker/tracker.pages.inc
index 1466848e5cdf83ff666d7a7fa781053ece1ff437..060f0f483bdee3ccfe6c1be03cb06ac1a5539c20 100644
--- a/modules/tracker/tracker.pages.inc
+++ b/modules/tracker/tracker.pages.inc
@@ -61,8 +61,8 @@ function tracker_page($account = NULL, $set_title = FALSE) {
$rows[] = array(
check_plain(node_type_get_name($node->type)),
- l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', node_mark($node->nid, $node->changed)),
- theme('username', $node),
+ l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
+ theme('username', array('account' => $node)),
array('class' => array('replies'), 'data' => $comments),
t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))
);
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc
index 9db7a928f795aeffa73037f73780696db618c63c..e3350f80c8310af8e016b11f798d6e1e852715f9 100644
--- a/modules/trigger/trigger.admin.inc
+++ b/modules/trigger/trigger.admin.inc
@@ -255,14 +255,18 @@ function trigger_assign_form_submit($form, $form_state) {
/**
* Displays actions assigned to this hook in a table.
*
- * @param array $element
- * The fieldset including all assigned actions.
+ * @param $variables
+ * An associative array containing:
+ * - element: The fieldset including all assigned actions.
+ *
* @return
* The rendered form with the table prepended.
*
* @ingroup themeable
*/
-function theme_trigger_display($element) {
+function theme_trigger_display($variables) {
+ $element = $variables['element'];
+
$header = array();
$rows = array();
if (isset($element['assigned']) && count($element['assigned']['#value'])) {
@@ -277,7 +281,7 @@ function theme_trigger_display($element) {
}
if (count($rows)) {
- $output = theme('table', $header, $rows) . drupal_render_children($element);
+ $output = theme('table', array('header' => $header, 'rows' => $rows)) . drupal_render_children($element);
}
else {
$output = drupal_render_children($element);
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index d889007e48ac700926d4f3fc2cc829a9d4d91bf7..7c831ebe44cdfc4000187b8cd803ef5a207e477d 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -180,7 +180,7 @@ function trigger_get_assigned_actions($hook) {
function trigger_theme() {
return array(
'trigger_display' => array(
- 'arguments' => array('element'),
+ 'arguments' => array('element' => NULL),
'file' => 'trigger.admin.inc',
),
);
diff --git a/modules/update/update.report.inc b/modules/update/update.report.inc
index 4d9b8f785b057f44554d2204a09c52a35c2f63d9..8cc3a6d1c6bfe79bb4c4e8c32db21391816e5c09 100644
--- a/modules/update/update.report.inc
+++ b/modules/update/update.report.inc
@@ -13,10 +13,10 @@ function update_status() {
if ($available = update_get_available(TRUE)) {
module_load_include('inc', 'update', 'update.compare');
$data = update_calculate_project_data($available);
- return theme('update_report', $data);
+ return theme('update_report', array('data' => $data));
}
else {
- return theme('update_report', _update_no_data());
+ return theme('update_report', array('data' => _update_no_data()));
}
}
@@ -25,7 +25,9 @@ function update_status() {
*
* @ingroup themeable
*/
-function theme_update_report($data) {
+function theme_update_report($variables) {
+ $data = $variables['data'];
+
$last = variable_get('update_last_check', 0);
$output = '<div class="update checked">' . ($last ? t('Last checked: @timestamp (@time ago)', array('@time' => format_interval(REQUEST_TIME - $last), '@timestamp' => format_date($last))) : t('Last checked: never'));
$output .= ' <span class="check-manually">(' . l(t('Check manually'), 'admin/reports/updates/check') . ')</span>';
@@ -54,29 +56,29 @@ function theme_update_report($data) {
switch ($project['status']) {
case UPDATE_CURRENT:
$class = 'ok';
- $icon = theme('image', 'misc/watchdog-ok.png', t('ok'), t('ok'));
+ $icon = theme('image', array('path' => 'misc/watchdog-ok.png', 'alt' => t('ok'), 'title' => t('ok')));
break;
case UPDATE_UNKNOWN:
case UPDATE_NOT_FETCHED:
$class = 'unknown';
- $icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
+ $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning')));
break;
case UPDATE_NOT_SECURE:
case UPDATE_REVOKED:
case UPDATE_NOT_SUPPORTED:
$class = 'error';
- $icon = theme('image', 'misc/watchdog-error.png', t('error'), t('error'));
+ $icon = theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error')));
break;
case UPDATE_NOT_CHECKED:
case UPDATE_NOT_CURRENT:
default:
$class = 'warning';
- $icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
+ $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning')));
break;
}
$row = '<div class="version-status">';
- $status_label = theme('update_status_label', $project['status']);
+ $status_label = theme('update_status_label', array('status' => $project['status']));
$row .= !empty($status_label) ? $status_label : check_plain($project['reason']);
$row .= '<span class="icon">' . $icon . '</span>';
$row .= "</div>\n";
@@ -127,31 +129,31 @@ function theme_update_report($data) {
) {
$version_class[] = 'version-recommended-strong';
}
- $row .= theme('update_version', $project['releases'][$project['recommended']], t('Recommended version:'), $version_class);
+ $row .= theme('update_version', array('version' => $project['releases'][$project['recommended']], 'tag' => t('Recommended version:'), 'class' => $version_class));
}
// Now, print any security updates.
if (!empty($project['security updates'])) {
foreach ($project['security updates'] as $security_update) {
- $row .= theme('update_version', $security_update, t('Security update:'), 'version-security' . $security_class);
+ $row .= theme('update_version', array('version' => $security_update, 'tag' => t('Security update:'), 'class' => 'version-security' . $security_class));
}
}
}
if ($project['recommended'] !== $project['latest_version']) {
- $row .= theme('update_version', $project['releases'][$project['latest_version']], t('Latest version:'), array('version-latest'));
+ $row .= theme('update_version', array('version' => $project['releases'][$project['latest_version']], 'tag' => t('Latest version:'), 'class' => array('version-latest')));
}
if ($project['install_type'] == 'dev'
&& $project['status'] != UPDATE_CURRENT
&& isset($project['dev_version'])
&& $project['recommended'] !== $project['dev_version']) {
- $row .= theme('update_version', $project['releases'][$project['dev_version']], t('Development version:'), array('version-latest'));
+ $row .= theme('update_version', array('version' => $project['releases'][$project['dev_version']], 'tag' => t('Development version:'), 'class' => array('version-latest')));
}
}
if (isset($project['also'])) {
foreach ($project['also'] as $also) {
- $row .= theme('update_version', $project['releases'][$also], t('Also available:'), array('version-also-available'));
+ $row .= theme('update_version', array('version' => $project['releases'][$also], 'tag' => t('Also available:'), 'class' => array('version-also-available')));
}
}
@@ -163,7 +165,7 @@ function theme_update_report($data) {
foreach ($project['extra'] as $key => $value) {
$row .= '<div class="' . implode(' ', $value['class']) . '">';
$row .= check_plain($value['label']) . ': ';
- $row .= theme('placeholder', $value['data']);
+ $row .= theme('placeholder', array('text' => $value['data']));
$row .= "</div>\n";
}
$row .= "</div>\n"; // extra div.
@@ -178,7 +180,7 @@ function theme_update_report($data) {
$row .= t('Includes:');
$includes_items[] = t('Enabled: %includes', array('%includes' => implode(', ', $project['includes'])));
$includes_items[] = t('Disabled: %disabled', array('%disabled' => implode(', ', $project['disabled'])));
- $row .= theme('item_list', $includes_items);
+ $row .= theme('item_list', array('items' => $includes_items));
}
else {
$row .= t('Includes: %includes', array('%includes' => implode(', ', $project['includes'])));
@@ -194,7 +196,7 @@ function theme_update_report($data) {
case UPDATE_NOT_SECURE:
case UPDATE_REVOKED:
case UPDATE_NOT_SUPPORTED:
- $base_themes[] = t('%base_theme (!base_label)', array('%base_theme' => $base_theme, '!base_label' => theme('update_status_label', $status[$base_key])));
+ $base_themes[] = t('%base_theme (!base_label)', array('%base_theme' => $base_theme, '!base_label' => theme('update_status_label', array('status' => $status[$base_key]))));
break;
default:
@@ -235,7 +237,7 @@ function theme_update_report($data) {
if (!empty($rows[$type_name])) {
ksort($rows[$type_name]);
$output .= "\n<h3>" . $type_label . "</h3>\n";
- $output .= theme('table', $header, $rows[$type_name], array('class' => array('update')));
+ $output .= theme('table', array('header' => $header, 'rows' => $rows[$type_name], 'attributes' => array('class' => array('update'))));
}
}
drupal_add_css(drupal_get_path('module', 'update') . '/update.css');
@@ -245,13 +247,14 @@ function theme_update_report($data) {
/**
* Generate the HTML for the label to display for a project's update status.
*
- * @param $status
- * The integer code for a project's current update status.
+ * @param $variables
+ * An associative array containing:
+ * - status: The integer code for a project's current update status.
*
* @see update_calculate_project_data()
*/
-function theme_update_status_label($status) {
- switch ($status) {
+function theme_update_status_label($variables) {
+ switch ($variables['status']) {
case UPDATE_NOT_SECURE:
return '<span class="security-error">' . t('Security update required!') . '</span>';
@@ -275,7 +278,11 @@ function theme_update_status_label($status) {
*
* @ingroup themeable
*/
-function theme_update_version($version, $tag, $class) {
+function theme_update_version($variables) {
+ $version = $variables['version'];
+ $tag = $variables['tag'];
+ $class = $variables['class'];
+
$output = '';
$output .= '<table class="version ' . $class . '">';
$output .= '<tr>';
@@ -294,7 +301,7 @@ function theme_update_version($version, $tag, $class) {
'title' => t('Release notes'),
'href' => $version['release_link'],
);
- $output .= theme('links', $links);
+ $output .= theme('links', array('links' => $links));
$output .= '</td>';
$output .= '</tr>';
$output .= "</table>\n";
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index d00e7e22798dc8b3b900b839d137867e19aa8a33..3edcdbed0028f746a3bea9344c0af13b98925143 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -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($elements) {
}
}
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;
}
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index d8ae9b6996c1dea4701e7e6b78e3e776308362dd..5bc88acefe6d870ec27a624a1bfb8e00fc80555d 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -187,9 +187,9 @@ function user_admin_account() {
asort($users_roles);
$options[$account->uid] = array(
- 'username' => theme('username', $account),
+ 'username' => theme('username', array('account' => $account)),
'status' => $status[$account->status],
- 'roles' => theme('item_list', $users_roles),
+ 'roles' => theme('item_list', array('items' => $users_roles)),
'member_for' => format_interval(REQUEST_TIME - $account->created),
'access' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'),
'operations' => l(t('edit'), "user/$account->uid/edit", array('query' => $destination)),
@@ -202,7 +202,7 @@ function user_admin_account() {
'#options' => $options,
'#empty' => t('No people available.'),
);
- $form['pager'] = array('#markup' => theme('pager', NULL));
+ $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL)));
return $form;
}
@@ -682,7 +682,9 @@ function user_admin_permissions_submit($form, &$form_state) {
*
* @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();
@@ -707,7 +709,7 @@ function theme_user_admin_permissions($form) {
$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;
}
@@ -770,7 +772,7 @@ function user_admin_role_validate($form, &$form_state) {
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'])));
}
}
@@ -808,7 +810,9 @@ function user_admin_role_submit($form, &$form_state) {
*
* @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);
@@ -822,7 +826,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;
}
@@ -832,7 +836,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 = '<div id="user-admin-filter">';
$output .= drupal_render($form['filters']);
$output .= '</div>';
@@ -845,7 +851,9 @@ function theme_user_filter_form($form) {
*
* @ingroup themeable
*/
-function theme_user_filters($form) {
+function theme_user_filters($variables) {
+ $form = $variables['form'];
+
$output = '<ul class="clearfix">';
if (!empty($form['current'])) {
foreach (element_children($form['current']) as $key) {
diff --git a/modules/user/user.module b/modules/user/user.module
index 2c8330455743600b40894878a97b7f931bbff022..9c8e728697a6f4927f358f2b9e1fa3b7f62a6a3e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -836,7 +836,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'])) {
@@ -954,7 +954,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;
}
@@ -1041,7 +1041,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;
@@ -1077,7 +1077,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');
@@ -1121,10 +1121,10 @@ function template_preprocess_user_picture(&$variables) {
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);
@@ -1137,20 +1137,24 @@ function template_preprocess_user_picture(&$variables) {
/**
* 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() {
@@ -1907,7 +1911,7 @@ function user_edit_form(&$form, &$form_state) {
'#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',
@@ -2834,8 +2838,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 .= '<div class="clear">';
$output .= '<div>—</div>';
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 154216c411e3083518764ba18a34f0e4f0612048..a3fccfb6fada0214848a79e2bbe3f8d61a1809b3 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -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;
diff --git a/themes/seven/template.php b/themes/seven/template.php
index 6f40681ff0600dd3618fe0917d72ce9f9bb59243..1065b44cfafe40e8c43ebc318f48fadf948d18dd 100644
--- a/themes/seven/template.php
+++ b/themes/seven/template.php
@@ -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 = '<ul class="node-type-list">';
@@ -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() ? '<ul class="admin-list compact">' : '<ul class="admin-list">';
@@ -57,13 +59,14 @@ function seven_admin_block_content($content) {
*
* 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($style) {
*
* 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');
diff --git a/update.php b/update.php
index f61d6388d2da11256c1de9af8f04f094ac23c1c6..a5af15854916c2c738f9038daaec4c6a227dd7c1 100644
--- a/update.php
+++ b/update.php
@@ -66,7 +66,7 @@ function update_script_selection_form() {
'#value' => $update['start'],
);
$form['start'][$module . '_updates'] = array(
- '#markup' => theme('item_list', $update['pending'], $module . ' module'),
+ '#markup' => theme('item_list', array('items' => $update['pending'], 'title' => $module . ' module')),
);
}
if (isset($update['pending'])) {
@@ -78,7 +78,7 @@ function update_script_selection_form() {
drupal_set_message(t('No pending updates.'));
unset($form);
$form['links'] = array(
- '#markup' => theme('item_list', update_helpful_links()),
+ '#markup' => theme('item_list', array('items' => update_helpful_links())),
);
}
else {
@@ -136,7 +136,7 @@ function update_results_page() {
$output .= "<p><strong>Reminder: don't forget to set the <code>\$update_free_access</code> value in your <code>settings.php</code> file back to <code>FALSE</code>.</strong></p>";
}
- $output .= theme('item_list', $links);
+ $output .= theme('item_list', array('items' => $links));
// Output a list of queries executed
if (!empty($_SESSION['update_results'])) {
@@ -224,7 +224,7 @@ function update_task_list($active = NULL) {
'finished' => 'Review log',
);
- drupal_add_region_content('sidebar_first', theme('task_list', $tasks, $active));
+ drupal_add_region_content('sidebar_first', theme('task_list', array('items' => $tasks, 'active' => $active)));
}
/**
@@ -252,9 +252,9 @@ function update_check_requirements() {
if ($severity == REQUIREMENT_ERROR) {
update_task_list('requirements');
drupal_set_title('Requirements problem');
- $status_report = theme('status_report', $requirements);
+ $status_report = theme('status_report', array('requirements' => $requirements));
$status_report .= 'Please check the error messages and <a href="' . request_uri() . '">try again</a>.';
- print theme('update_page', $status_report);
+ print theme('update_page', array('content' => $status_report));
exit();
}
}
@@ -363,5 +363,5 @@ function update_check_requirements() {
if (isset($output) && $output) {
// We defer the display of messages until all updates are done.
$progress_page = ($batch = batch_get()) && isset($batch['running']);
- print theme('update_page', $output, !$progress_page);
+ print theme('update_page', array('content' => $output, 'show_messages' => !$progress_page));
}