Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.18
diff -u -r1.18 block.admin.inc
--- modules/block/block.admin.inc 25 Jun 2008 09:52:41 -0000 1.18
+++ modules/block/block.admin.inc 5 Jul 2008 03:29:24 -0000
@@ -53,7 +53,7 @@
'#value' => $block['delta'],
);
$form[$key]['info'] = array(
- '#value' => check_plain($block['info']),
+ '#markup' => check_plain($block['info']),
);
$form[$key]['theme'] = array(
'#type' => 'hidden',
@@ -69,7 +69,7 @@
'#options' => $block_regions,
);
$form[$key]['configure'] = array(
- '#value' => l(t('configure'),
+ '#markup' => l(t('configure'),
'admin/build/block/configure/' . $block['module'] . '/' . $block['delta']),
);
if ($block['module'] == 'block') {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.911
diff -u -r1.911 user.module
--- modules/user/user.module 27 Jun 2008 07:25:11 -0000 1.911
+++ modules/user/user.module 5 Jul 2008 03:30:17 -0000
@@ -653,7 +653,7 @@
$account->content['summary']['member_for'] = array(
'#type' => 'user_profile_item',
'#title' => t('Member for'),
- '#value' => format_interval(time() - $account->created),
+ '#markup' => format_interval(time() - $account->created),
);
}
if ($type == 'form' && $category == 'account') {
@@ -701,7 +701,7 @@
$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('#value' => theme('item_list', $items));
+ $form['links'] = array('#markup' => theme('item_list', $items));
return $form;
}
@@ -1493,7 +1493,7 @@
$form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
$picture = theme('user_picture', (object)$edit);
if ($edit['picture']) {
- $form['picture']['current_picture'] = array('#value' => $picture);
+ $form['picture']['current_picture'] = array('#markup' => $picture);
$form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
}
else {
@@ -2335,7 +2335,7 @@
// Display the registration form.
if (!$admin) {
- $form['user_registration_help'] = array('#value' => filter_xss_admin(variable_get('user_registration_help', '')));
+ $form['user_registration_help'] = array('#markup' => filter_xss_admin(variable_get('user_registration_help', '')));
}
// Merge in the default user edit fields.
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.22
diff -u -r1.22 user.admin.inc
--- modules/user/user.admin.inc 7 May 2008 19:34:24 -0000 1.22
+++ modules/user/user.admin.inc 5 Jul 2008 03:30:11 -0000
@@ -49,10 +49,10 @@
$options = $type == 'permission' ? call_user_func_array('array_merge', $filters[$type]['options']) : $filters[$type]['options'];
$params = array('%property' => $filters[$type]['title'] , '%value' => $options[$value]);
if ($i++ > 0) {
- $form['filters']['current'][] = array('#value' => t('and where %property is %value', $params));
+ $form['filters']['current'][] = array('#markup' => t('and where %property is %value', $params));
}
else {
- $form['filters']['current'][] = array('#value' => t('%property is %value', $params));
+ $form['filters']['current'][] = array('#markup' => t('%property is %value', $params));
}
}
@@ -171,24 +171,24 @@
$accounts = array();
while ($account = db_fetch_object($result)) {
$accounts[$account->uid] = '';
- $form['name'][$account->uid] = array('#value' => theme('username', $account));
- $form['status'][$account->uid] = array('#value' => $status[$account->status]);
+ $form['name'][$account->uid] = array('#markup' => theme('username', $account));
+ $form['status'][$account->uid] = array('#markup' => $status[$account->status]);
$users_roles = array();
$roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = %d', $account->uid);
while ($user_role = db_fetch_object($roles_result)) {
$users_roles[] = $roles[$user_role->rid];
}
asort($users_roles);
- $form['roles'][$account->uid][0] = array('#value' => theme('item_list', $users_roles));
- $form['member_for'][$account->uid] = array('#value' => format_interval(time() - $account->created));
- $form['last_access'][$account->uid] = array('#value' => $account->access ? t('@time ago', array('@time' => format_interval(time() - $account->access))) : t('never'));
- $form['operations'][$account->uid] = array('#value' => l(t('edit'), "user/$account->uid/edit", array('query' => $destination)));
+ $form['roles'][$account->uid][0] = array('#markup' => theme('item_list', $users_roles));
+ $form['member_for'][$account->uid] = array('#markup' => format_interval(time() - $account->created));
+ $form['last_access'][$account->uid] = array('#markup' => $account->access ? t('@time ago', array('@time' => format_interval(time() - $account->access))) : t('never'));
+ $form['operations'][$account->uid] = array('#markup' => l(t('edit'), "user/$account->uid/edit", array('query' => $destination)));
}
$form['accounts'] = array(
'#type' => 'checkboxes',
'#options' => $accounts
);
- $form['pager'] = array('#value' => theme('pager', NULL, 50, 0));
+ $form['pager'] = array('#markup' => theme('pager', NULL, 50, 0));
return $form;
}
@@ -513,7 +513,7 @@
foreach (module_list(FALSE, FALSE, TRUE) as $module) {
if ($permissions = module_invoke($module, 'perm')) {
$form['permission'][] = array(
- '#value' => $module,
+ '#markup' => $module,
);
ksort($permissions);
foreach ($permissions as $perm => $description) {
@@ -525,7 +525,7 @@
$options[$perm] = '';
$form['permission'][$perm] = array(
'#type' => 'item',
- '#value' => t($perm),
+ '#markup' => t($perm),
'#description' => $hide_descriptions ? $description : NULL,
);
foreach ($role_names as $rid => $name) {
@@ -541,7 +541,7 @@
// Have to build checkboxes here after checkbox arrays are built
foreach ($role_names as $rid => $name) {
$form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array());
- $form['role_names'][$rid] = array('#value' => $name, '#tree' => TRUE);
+ $form['role_names'][$rid] = array('#markup' => $name, '#tree' => TRUE);
}
$form['submit'] = array('#type' => 'submit', '#value' => t('Save permissions'));
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.13
diff -u -r1.13 user.pages.inc
--- modules/user/user.pages.inc 14 Apr 2008 17:48:43 -0000 1.13
+++ modules/user/user.pages.inc 5 Jul 2008 03:30:17 -0000
@@ -105,8 +105,8 @@
drupal_goto('user/' . $user->uid . '/edit');
}
else {
- $form['message'] = array('#value' => t('This is a one-time login for %user_name and will expire on %expiration_date.
Click on this button to login to the site and change your password.
', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
- $form['help'] = array('#value' => '' . t('This login can be used only once.') . '
');
+ $form['message'] = array('#markup' => t('This is a one-time login for %user_name and will expire on %expiration_date.
Click on this button to login to the site and change your password.
', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
+ $form['help'] = array('#markup' => '' . t('This login can be used only once.') . '
');
$form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
$form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
return $form;
@@ -186,7 +186,7 @@
*/
function template_preprocess_user_profile_item(&$variables) {
$variables['title'] = $variables['element']['#title'];
- $variables['value'] = $variables['element']['#value'];
+ $variables['value'] = $variables['element']['#markup'];
$variables['attributes'] = '';
if (isset($variables['element']['#attributes'])) {
$variables['attributes'] = drupal_attributes($variables['element']['#attributes']);
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.202
diff -u -r1.202 upload.module
--- modules/upload/upload.module 14 May 2008 13:19:48 -0000 1.202
+++ modules/upload/upload.module 5 Jul 2008 03:30:10 -0000
@@ -283,7 +283,7 @@
if (count($node->files)) {
if (!$teaser && user_access('view uploaded files')) {
$node->content['files'] = array(
- '#value' => theme('upload_attachments', $node->files),
+ '#markup' => theme('upload_attachments', $node->files),
'#weight' => 50,
);
}
@@ -484,7 +484,7 @@
$description = file_create_url($file->filepath);
$description = "" . check_plain($description) . "";
$form['files'][$key]['description'] = array('#type' => 'textfield', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => $description );
- $form['files'][$key]['size'] = array('#value' => format_size($file->filesize));
+ $form['files'][$key]['size'] = array('#markup' => format_size($file->filesize));
$form['files'][$key]['remove'] = array('#type' => 'checkbox', '#default_value' => !empty($file->remove));
$form['files'][$key]['list'] = array('#type' => 'checkbox', '#default_value' => $file->list);
$form['files'][$key]['weight'] = array('#type' => 'weight', '#delta' => count($node->files), '#default_value' => $file->weight);
Index: modules/upload/upload.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.admin.inc,v
retrieving revision 1.9
diff -u -r1.9 upload.admin.inc
--- modules/upload/upload.admin.inc 20 Apr 2008 07:58:38 -0000 1.9
+++ modules/upload/upload.admin.inc 5 Jul 2008 03:30:08 -0000
@@ -107,7 +107,7 @@
'#field_suffix' => t('MB'),
);
- $form['settings_general']['upload_max_size'] = array('#value' => '' . t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '
');
+ $form['settings_general']['upload_max_size'] = array('#markup' => '' . t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '
');
$roles = user_roles(FALSE, 'upload files');
$form['roles'] = array('#type' => 'value', '#value' => $roles);
Index: modules/openid/openid.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v
retrieving revision 1.25
diff -u -r1.25 openid.module
--- modules/openid/openid.module 6 May 2008 12:18:48 -0000 1.25
+++ modules/openid/openid.module 5 Jul 2008 03:29:51 -0000
@@ -95,7 +95,7 @@
);
$form['openid_links'] = array(
- '#value' => theme('item_list', $items),
+ '#markup' => theme('item_list', $items),
'#weight' => 1,
);
Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.10
diff -u -r1.10 contact.pages.inc
--- modules/contact/contact.pages.inc 19 Apr 2008 14:44:34 -0000 1.10
+++ modules/contact/contact.pages.inc 5 Jul 2008 03:29:34 -0000
@@ -177,11 +177,11 @@
$form['recipient'] = array('#type' => 'value', '#value' => $recipient);
$form['from'] = array('#type' => 'item',
'#title' => t('From'),
- '#value' => check_plain($user->name) . ' <' . check_plain($user->mail) . '>',
+ '#markup' => check_plain($user->name) . ' <' . check_plain($user->mail) . '>',
);
$form['to'] = array('#type' => 'item',
'#title' => t('To'),
- '#value' => check_plain($recipient->name),
+ '#markup' => check_plain($recipient->name),
);
$form['subject'] = array('#type' => 'textfield',
'#title' => t('Subject'),
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.213
diff -u -r1.213 filter.module
--- modules/filter/filter.module 6 May 2008 12:18:47 -0000 1.213
+++ modules/filter/filter.module 5 Jul 2008 03:29:38 -0000
@@ -508,10 +508,10 @@
$tips = _filter_tips(variable_get('filter_default_format', 1), FALSE);
$form['format']['guidelines'] = array(
'#title' => t('Formatting guidelines'),
- '#value' => theme('filter_tips', $tips, FALSE, $extra),
+ '#markup' => theme('filter_tips', $tips, FALSE, $extra),
);
}
- $form[] = array('#value' => $extra);
+ $form[] = array('#markup' => $extra);
return $form;
}
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.11
diff -u -r1.11 filter.admin.inc
--- modules/filter/filter.admin.inc 14 Apr 2008 17:48:37 -0000 1.11
+++ modules/filter/filter.admin.inc 5 Jul 2008 03:29:35 -0000
@@ -30,10 +30,10 @@
}
$default = ($id == variable_get('filter_default_format', 1));
$options[$id] = '';
- $form[$id]['name'] = array('#value' => $format->name);
- $form[$id]['roles'] = array('#value' => $default ? t('All roles may use default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format')));
- $form[$id]['configure'] = array('#value' => l(t('configure'), 'admin/settings/filters/' . $id));
- $form[$id]['delete'] = array('#value' => $default ? '' : l(t('delete'), 'admin/settings/filters/delete/' . $id));
+ $form[$id]['name'] = array('#markup' => $format->name);
+ $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format')));
+ $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/filters/' . $id));
+ $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filters/delete/' . $id));
$form[$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight);
}
$form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1));
@@ -166,7 +166,7 @@
}
$group = '' . t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.') . '
';
$group .= $tiplist;
- $form['tips'] = array('#value' => '' . t('Formatting guidelines') . '
' . $group);
+ $form['tips'] = array('#markup' => '' . t('Formatting guidelines') . '
' . $group);
}
$form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
@@ -325,7 +325,7 @@
$form = system_settings_form($form);
}
else {
- $form['error'] = array('#value' => t('No settings are available.'));
+ $form['error'] = array('#markup' => t('No settings are available.'));
}
$form['format'] = array('#type' => 'hidden', '#value' => $format->format);
$form['#submit'][] = 'filter_admin_configure_submit';
@@ -360,7 +360,7 @@
$form['weights'] = array('#tree' => TRUE);
foreach ($filters as $id => $filter) {
- $form['names'][$id] = array('#value' => $filter->name);
+ $form['names'][$id] = array('#markup' => $filter->name);
$form['weights'][$id] = array('#type' => 'weight', '#default_value' => $filter->weight);
}
$form['format'] = array('#type' => 'hidden', '#value' => $format->format);
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.41
diff -u -r1.41 color.module
--- modules/color/color.module 19 May 2008 19:36:41 -0000 1.41
+++ modules/color/color.module 5 Jul 2008 03:29:29 -0000
@@ -57,7 +57,7 @@
foreach (element_children($form) as $theme) {
if ($screenshot = variable_get('color_' . $theme . '_screenshot', NULL)) {
if (isset($form[$theme]['screenshot'])) {
- $form[$theme]['screenshot']['#value'] = theme('image', $screenshot, '', '', array('class' => 'screenshot'), FALSE);
+ $form[$theme]['screenshot']['#markup'] = theme('image', $screenshot, '', '', array('class' => 'screenshot'), FALSE);
}
}
}
Index: modules/trigger/trigger.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v
retrieving revision 1.6
diff -u -r1.6 trigger.admin.inc
--- modules/trigger/trigger.admin.inc 14 Apr 2008 17:48:43 -0000 1.6
+++ modules/trigger/trigger.admin.inc 5 Jul 2008 03:30:08 -0000
@@ -173,7 +173,7 @@
}
else {
$form[$op]['none'] = array(
- '#value' => t('No available actions for this trigger.')
+ '#markup' => t('No available actions for this trigger.')
);
}
return $form;
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.457
diff -u -r1.457 forum.module
--- modules/forum/forum.module 30 May 2008 18:17:35 -0000 1.457
+++ modules/forum/forum.module 5 Jul 2008 03:29:40 -0000
@@ -199,7 +199,7 @@
if (!$teaser) {
$node->content['forum_navigation'] = array(
- '#value' => theme('forum_topic_navigation', $node),
+ '#markup' => theme('forum_topic_navigation', $node),
'#weight' => 100,
);
}
@@ -360,7 +360,7 @@
// Hide critical options from forum vocabulary.
if ($form_id == 'taxonomy_form_vocabulary') {
$form['help_forum_vocab'] = array(
- '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
+ '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
'#weight' => -1,
);
$form['content_types']['nodes']['#required'] = TRUE;
Index: modules/forum/forum.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v
retrieving revision 1.11
diff -u -r1.11 forum.admin.inc
--- modules/forum/forum.admin.inc 30 May 2008 18:17:35 -0000 1.11
+++ modules/forum/forum.admin.inc 5 Jul 2008 03:29:38 -0000
@@ -225,12 +225,12 @@
foreach (element_children($form) as $key) {
if (isset($form[$key]['#term'])) {
$term = $form[$key]['#term'];
- $form[$key]['view']['#value'] = l($term['name'], 'forum/' . $term['tid']);
+ $form[$key]['view']['#markup'] = l($term['name'], 'forum/' . $term['tid']);
if (in_array($form[$key]['#term']['tid'], variable_get('forum_containers', array()))) {
- $form[$key]['edit']['#value'] = l(t('edit container'), 'admin/build/forum/edit/container/' . $term['tid']);
+ $form[$key]['edit']['#markup'] = l(t('edit container'), 'admin/build/forum/edit/container/' . $term['tid']);
}
else {
- $form[$key]['edit']['#value'] = l(t('edit forum'), 'admin/build/forum/edit/forum/' . $term['tid']);
+ $form[$key]['edit']['#markup'] = l(t('edit forum'), 'admin/build/forum/edit/forum/' . $term['tid']);
}
}
}
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.275
diff -u -r1.275 form.inc
--- includes/form.inc 25 Jun 2008 09:57:07 -0000 1.275
+++ includes/form.inc 5 Jul 2008 03:29:16 -0000
@@ -1836,7 +1836,7 @@
* @ingroup themeable
*/
function theme_item($element) {
- return theme('form_element', $element, $element['#value'] . (!empty($element['#children']) ? $element['#children'] : ''));
+ return theme('form_element', $element, $element['#markup'] . (!empty($element['#children']) ? $element['#children'] : ''));
}
/**
@@ -2085,7 +2085,7 @@
*/
function theme_markup($element) {
- return (isset($element['#value']) ? $element['#value'] : '') . (isset($element['#children']) ? $element['#children'] : '');
+ return (isset($element['#markup']) ? $element['#markup'] : '') . (isset($element['#children']) ? $element['#children'] : '');
}
/**
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.776
diff -u -r1.776 common.inc
--- includes/common.inc 2 Jul 2008 19:36:52 -0000 1.776
+++ includes/common.inc 5 Jul 2008 03:29:11 -0000
@@ -2741,26 +2741,16 @@
// Render all the children that use a theme function.
if (isset($elements['#theme']) && empty($elements['#theme_used'])) {
$elements['#theme_used'] = TRUE;
-
- $previous = array();
- foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
- $previous[$key] = isset($elements[$key]) ? $elements[$key] : NULL;
- }
// If we rendered a single element, then we will skip the renderer.
if (empty($children)) {
$elements['#printed'] = TRUE;
}
else {
- $elements['#value'] = '';
+ $elements['#markup'] = '';
}
- $elements['#type'] = 'markup';
-
+
unset($elements['#prefix'], $elements['#suffix']);
$content = theme($elements['#theme'], $elements);
-
- foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
- $elements[$key] = isset($previous[$key]) ? $previous[$key] : NULL;
- }
}
// Render each of the children using drupal_render and concatenate them.
if (!isset($content) || $content === '') {
Index: includes/image.gd.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/image.gd.inc,v
retrieving revision 1.6
diff -u -r1.6 image.gd.inc
--- includes/image.gd.inc 14 Apr 2008 17:48:33 -0000 1.6
+++ includes/image.gd.inc 5 Jul 2008 03:29:17 -0000
@@ -25,7 +25,7 @@
if (image_gd_check_settings()) {
$form = array();
$form['status'] = array(
- '#value' => t('The GD toolkit is installed and working properly.')
+ '#markup' => t('The GD toolkit is installed and working properly.')
);
$form['image_jpeg_quality'] = array(
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.176
diff -u -r1.176 locale.inc
--- includes/locale.inc 26 May 2008 17:12:54 -0000 1.176
+++ includes/locale.inc 5 Jul 2008 03:29:22 -0000
@@ -46,9 +46,9 @@
'#type' => 'weight',
'#default_value' => $language->weight
);
- $form['name'][$langcode] = array('#value' => check_plain($language->name));
- $form['native'][$langcode] = array('#value' => check_plain($language->native));
- $form['direction'][$langcode] = array('#value' => ($language->direction == LANGUAGE_RTL ? t('Right to left') : t('Left to right')));
+ $form['name'][$langcode] = array('#markup' => check_plain($language->name));
+ $form['native'][$langcode] = array('#markup' => check_plain($language->native));
+ $form['direction'][$langcode] = array('#markup' => ($language->direction == LANGUAGE_RTL ? t('Right to left') : t('Left to right')));
}
$form['enabled'] = array('#type' => 'checkboxes',
'#options' => $options,
@@ -230,11 +230,11 @@
$form['langcode_view'] = array(
'#type' => 'item',
'#title' => t('Language code'),
- '#value' => $language->language
+ '#markup' => $language->language
);
$form['langcode'] = array(
'#type' => 'value',
- '#value' => $language->language
+ '#markup' => $language->language
);
}
else {
@@ -782,7 +782,7 @@
'original' => array(
'#type' => 'item',
'#title' => t('Original text'),
- '#value' => check_plain(wordwrap($source->source, 0)),
+ '#markup' => check_plain(wordwrap($source->source, 0)),
),
'lid' => array(
'#type' => 'value',
@@ -2237,7 +2237,7 @@
function _locale_get_predefined_list() {
return array(
"aa" => array("Afar"),
- "ab" => array("Abkhazian", "аҧÑ?уа бызшәа"),
+ "ab" => array("Abkhazian", "аҧÑ?уа бызшәа"),
"ae" => array("Avestan"),
"af" => array("Afrikaans"),
"ak" => array("Akan"),
@@ -2248,8 +2248,8 @@
"ay" => array("Aymara"),
"az" => array("Azerbaijani", "azərbaycan"),
"ba" => array("Bashkir"),
- "be" => array("Belarusian", "БеларуÑ?каÑ?"),
- "bg" => array("Bulgarian", "БългарÑ?ки"),
+ "be" => array("Belarusian", "БеларуÑ?каÑ?"),
+ "bg" => array("Bulgarian", "БългарÑ?ки"),
"bh" => array("Bihari"),
"bi" => array("Bislama"),
"bm" => array("Bambara", "Bamanankan"),
@@ -2270,14 +2270,14 @@
"de" => array("German", "Deutsch"),
"dv" => array("Maldivian"),
"dz" => array("Bhutani"),
- "ee" => array("Ewe", "Æ?Ê‹É›"),
+ "ee" => array("Ewe", "Æ?Ê‹É›"),
"el" => array("Greek", "Ελληνικά"),
"en" => array("English"),
"eo" => array("Esperanto"),
"es" => array("Spanish", "Español"),
"et" => array("Estonian", "Eesti"),
"eu" => array("Basque", "Euskera"),
- "fa" => array("Persian", /* Left-to-right marker "â€" */ "Ù?ارسی", LANGUAGE_RTL),
+ "fa" => array("Persian", /* Left-to-right marker "â€" */ "Ù?ارسی", LANGUAGE_RTL),
"ff" => array("Fulah", "Fulfulde"),
"fi" => array("Finnish", "Suomi"),
"fj" => array("Fiji"),
@@ -2292,7 +2292,7 @@
"gv" => array("Manx"),
"ha" => array("Hausa"),
"he" => array("Hebrew", /* Left-to-right marker "â€" */ "עברית", LANGUAGE_RTL),
- "hi" => array("Hindi", "हिन�दी"),
+ "hi" => array("Hindi", "हिन�दी"),
"ho" => array("Hiri Motu"),
"hr" => array("Croatian", "Hrvatski"),
"hu" => array("Hungarian", "Magyar"),
@@ -2303,7 +2303,7 @@
"ie" => array("Interlingue"),
"ig" => array("Igbo"),
"ik" => array("Inupiak"),
- "is" => array("Icelandic", "Ã?slenska"),
+ "is" => array("Icelandic", "Ã?slenska"),
"it" => array("Italian", "Italiano"),
"iu" => array("Inuktitut"),
"ja" => array("Japanese", "日本語"),
@@ -2315,7 +2315,7 @@
"kk" => array("Kazakh", "Қазақ"),
"kl" => array("Greenlandic"),
"km" => array("Cambodian"),
- "kn" => array("Kannada", "ಕನ�ನಡ"),
+ "kn" => array("Kannada", "ಕನ�ನಡ"),
"ko" => array("Korean", "í•œêµì–´"),
"kr" => array("Kanuri"),
"ks" => array("Kashmiri"),
@@ -2333,7 +2333,7 @@
"mg" => array("Malagasy"),
"mh" => array("Marshallese"),
"mi" => array("Maori"),
- "mk" => array("Macedonian", "МакедонÑ?ки"),
+ "mk" => array("Macedonian", "МакедонÑ?ки"),
"ml" => array("Malayalam", "മലയാളം"),
"mn" => array("Mongolian"),
"mo" => array("Moldavian"),
@@ -2365,7 +2365,7 @@
"rm" => array("Rhaeto-Romance"),
"rn" => array("Kirundi"),
"ro" => array("Romanian", "Română"),
- "ru" => array("Russian", "РуÑ?Ñ?кий"),
+ "ru" => array("Russian", "РуÑ?Ñ?кий"),
"rw" => array("Kinyarwanda"),
"sa" => array("Sanskrit"),
"sc" => array("Sardinian"),
@@ -2374,20 +2374,20 @@
"sg" => array("Sango"),
"sh" => array("Serbo-Croatian"),
"si" => array("Singhalese"),
- "sk" => array("Slovak", "SlovenÄ?ina"),
- "sl" => array("Slovenian", "SlovenÅ¡Ä?ina"),
+ "sk" => array("Slovak", "SlovenÄ?ina"),
+ "sl" => array("Slovenian", "SlovenÅ¡Ä?ina"),
"sm" => array("Samoan"),
"sn" => array("Shona"),
"so" => array("Somali"),
"sq" => array("Albanian", "Shqip"),
- "sr" => array("Serbian", "СрпÑ?ки"),
+ "sr" => array("Serbian", "СрпÑ?ки"),
"ss" => array("Siswati"),
"st" => array("Sesotho"),
"su" => array("Sudanese"),
"sv" => array("Swedish", "Svenska"),
"sw" => array("Swahili", "Kiswahili"),
- "ta" => array("Tamil", "தமிழ�"),
- "te" => array("Telugu", "తెల�గ�"),
+ "ta" => array("Tamil", "தமிழ�"),
+ "te" => array("Telugu", "తెల�గ�"),
"tg" => array("Tajik"),
"th" => array("Thai", "ภาษาไทย"),
"ti" => array("Tigrinya"),
@@ -2401,7 +2401,7 @@
"tw" => array("Twi"),
"ty" => array("Tahitian"),
"ug" => array("Uighur"),
- "uk" => array("Ukrainian", "УкраїнÑ?ька"),
+ "uk" => array("Ukrainian", "УкраїнÑ?ька"),
"ur" => array("Urdu", /* Left-to-right marker "â€" */ "اردو", LANGUAGE_RTL),
"uz" => array("Uzbek", "o'zbek"),
"ve" => array("Venda"),
@@ -2412,7 +2412,7 @@
"yo" => array("Yoruba", "Yorùbá"),
"za" => array("Zhuang"),
"zh-hans" => array("Chinese, Simplified", "简体ä¸æ–‡"),
- "zh-hant" => array("Chinese, Traditional", "ç¹?é«”ä¸æ–‡"),
+ "zh-hant" => array("Chinese, Traditional", "ç¹?é«”ä¸æ–‡"),
"zu" => array("Zulu", "isiZulu"),
);
}
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.14
diff -u -r1.14 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc 15 May 2008 21:27:32 -0000 1.14
+++ modules/aggregator/aggregator.pages.inc 5 Jul 2008 03:29:23 -0000
@@ -157,7 +157,7 @@
'#tree' => TRUE,
);
foreach ($items as $item) {
- $form['items'][$item->iid] = array('#value' => theme('aggregator_item', $item));
+ $form['items'][$item->iid] = array('#markup' => theme('aggregator_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 = %d', $item->iid);
$selected = array();
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.22
diff -u -r1.22 node.admin.inc
--- modules/node/node.admin.inc 14 Apr 2008 17:48:38 -0000 1.22
+++ modules/node/node.admin.inc 5 Jul 2008 03:29:44 -0000
@@ -21,7 +21,7 @@
'#type' => 'fieldset',
'#title' => t('Node access status'),
);
- $form['access']['status'] = array('#value' => $status);
+ $form['access']['status'] = array('#markup' => $status);
$form['access']['rebuild'] = array(
'#type' => 'submit',
'#value' => t('Rebuild permissions'),
@@ -236,10 +236,10 @@
$value = $filters[$type]['options'][$value];
}
if ($i++) {
- $form['filters']['current'][] = array('#value' => t('and where %a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ $form['filters']['current'][] = array('#markup' => t('and where %a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
}
else {
- $form['filters']['current'][] = array('#value' => t('%a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ $form['filters']['current'][] = array('#markup' => t('%a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
}
if (in_array($type, array('type', 'language'))) {
// Remove the option if it is already being filtered on.
@@ -495,17 +495,17 @@
while ($node = db_fetch_object($result)) {
$nodes[$node->nid] = '';
$options = empty($node->language) ? array() : array('language' => $languages[$node->language]);
- $form['title'][$node->nid] = array('#value' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', node_mark($node->nid, $node->changed)));
- $form['name'][$node->nid] = array('#value' => check_plain(node_get_types('name', $node)));
- $form['username'][$node->nid] = array('#value' => theme('username', $node));
- $form['status'][$node->nid] = array('#value' => ($node->status ? t('published') : t('not published')));
+ $form['title'][$node->nid] = array('#markup' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', node_mark($node->nid, $node->changed)));
+ $form['name'][$node->nid] = array('#markup' => check_plain(node_get_types('name', $node)));
+ $form['username'][$node->nid] = array('#markup' => theme('username', $node));
+ $form['status'][$node->nid] = array('#markup' => ($node->status ? t('published') : t('not published')));
if ($multilanguage) {
- $form['language'][$node->nid] = array('#value' => empty($node->language) ? t('Language neutral') : t($languages[$node->language]->name));
+ $form['language'][$node->nid] = array('#markup' => empty($node->language) ? t('Language neutral') : t($languages[$node->language]->name));
}
- $form['operations'][$node->nid] = array('#value' => l(t('edit'), 'node/' . $node->nid . '/edit', array('query' => $destination)));
+ $form['operations'][$node->nid] = array('#markup' => l(t('edit'), 'node/' . $node->nid . '/edit', array('query' => $destination)));
}
$form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
- $form['pager'] = array('#value' => theme('pager', NULL, 50, 0));
+ $form['pager'] = array('#markup' => theme('pager', NULL, 50, 0));
$form['#theme'] = 'node_admin_nodes';
return $form;
}
@@ -592,7 +592,7 @@
}
$output .= theme('table', $header, $rows);
- if ($form['pager']['#value']) {
+ if ($form['pager']['#markup']) {
$output .= drupal_render($form['pager']);
}
@@ -632,4 +632,3 @@
$form_state['redirect'] = 'admin/content/node';
return;
}
-
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.967
diff -u -r1.967 node.module
--- modules/node/node.module 26 May 2008 17:12:55 -0000 1.967
+++ modules/node/node.module 5 Jul 2008 03:29:50 -0000
@@ -1074,7 +1074,7 @@
}
$node->content['body'] = array(
- '#value' => $teaser ? $node->teaser : $node->body,
+ '#markup' => $teaser ? $node->teaser : $node->body,
'#weight' => 0,
);
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.56
diff -u -r1.56 content_types.inc
--- modules/node/content_types.inc 25 Jun 2008 09:52:41 -0000 1.56
+++ modules/node/content_types.inc 5 Jul 2008 03:29:43 -0000
@@ -94,7 +94,7 @@
$form['identity']['type_display'] = array(
'#title' => t('Type'),
'#type' => 'item',
- '#value' => theme('placeholder', $type->type),
+ '#markup' => theme('placeholder', $type->type),
'#description' => t('The machine-readable name of this content type. This field cannot be modified for system-defined content types.'),
);
}
Index: modules/profile/profile.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v
retrieving revision 1.10
diff -u -r1.10 profile.admin.inc
--- modules/profile/profile.admin.inc 14 Apr 2008 17:48:41 -0000 1.10
+++ modules/profile/profile.admin.inc 5 Jul 2008 03:29:54 -0000
@@ -22,9 +22,9 @@
$categories[] = $field->category;
// Save all field information
- $form[$field->fid]['name'] = array('#value' => check_plain($field->name));
- $form[$field->fid]['title'] = array('#value' => check_plain($field->title));
- $form[$field->fid]['type'] = array('#value' => $field->type);
+ $form[$field->fid]['name'] = array('#markup' => check_plain($field->name));
+ $form[$field->fid]['title'] = array('#markup' => check_plain($field->title));
+ $form[$field->fid]['type'] = array('#markup' => $field->type);
$form[$field->fid]['category'] = array('#type' => 'select', '#default_value' => $field->category, '#options' => array());
$form[$field->fid]['weight'] = array('#type' => 'weight', '#default_value' => $field->weight);
$form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/user/profile/edit/$field->fid"));
@@ -58,7 +58,7 @@
$addnewfields .= '' . l($value, "admin/user/profile/add/$key") . '';
}
$addnewfields .= '';
- $form['addnewfields'] = array('#value' => $addnewfields);
+ $form['addnewfields'] = array('#markup' => $addnewfields);
return $form;
}
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.31
diff -u -r1.31 menu.admin.inc
--- modules/menu/menu.admin.inc 25 Jun 2008 09:12:25 -0000 1.31
+++ modules/menu/menu.admin.inc 5 Jul 2008 03:29:42 -0000
@@ -69,7 +69,7 @@
$mlid = 'mlid:' . $item['mlid'];
$form[$mlid]['#item'] = $item;
$form[$mlid]['#attributes'] = $item['hidden'] ? array('class' => 'menu-disabled') : array('class' => 'menu-enabled');
- $form[$mlid]['title']['#value'] = l($item['title'], $item['href'], $item['localized_options']) . ($item['hidden'] ? ' (' . t('disabled') . ')' : '');
+ $form[$mlid]['title']['#markup'] = l($item['title'], $item['href'], $item['localized_options']) . ($item['hidden'] ? ' (' . t('disabled') . ')' : '');
$form[$mlid]['hidden'] = array(
'#type' => 'checkbox',
'#default_value' => !$item['hidden'],
@@ -600,7 +600,7 @@
function menu_configure() {
$form['intro'] = array(
'#type' => 'item',
- '#value' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option sets the default menu in which a new link will be added.'),
+ '#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option sets the default menu in which a new link will be added.'),
);
$menu_options = menu_get_menus();
@@ -635,4 +635,3 @@
return system_settings_form($form);
}
-
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.78
diff -u -r1.78 system.admin.inc
--- modules/system/system.admin.inc 1 Jul 2008 20:36:40 -0000 1.78
+++ modules/system/system.admin.inc 5 Jul 2008 03:30:00 -0000
@@ -196,15 +196,15 @@
}
$screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $theme->info['name'])), '', array('class' => 'screenshot'), FALSE) : t('no screenshot');
- $form[$theme->name]['screenshot'] = array('#value' => $screenshot);
+ $form[$theme->name]['screenshot'] = array('#markup' => $screenshot);
$form[$theme->name]['info'] = array(
'#type' => 'value',
- '#value' => $theme->info,
+ '#markup' => $theme->info,
);
$options[$theme->name] = '';
if (!empty($theme->status) || $theme->name == variable_get('admin_theme', '0')) {
- $form[$theme->name]['operations'] = array('#value' => l(t('configure'), 'admin/build/themes/settings/' . $theme->name) );
+ $form[$theme->name]['operations'] = array('#markup' => l(t('configure'), 'admin/build/themes/settings/' . $theme->name) );
}
else {
// Dummy element for drupal_render. Cleaner than adding a check in the theme function.
@@ -690,7 +690,7 @@
// Add text for dependencies.
if (!empty($dependencies)) {
$form['description'][$filename]['dependencies'] = array(
- '#value' => t('Depends on: !dependencies', array('!dependencies' => implode(', ', $dependencies))),
+ '#markup' => t('Depends on: !dependencies', array('!dependencies' => implode(', ', $dependencies))),
'#prefix' => '',
'#suffix' => '
',
);
@@ -713,7 +713,7 @@
// Add text for enabled dependents.
if (!empty($dependents)) {
$form['description'][$filename]['required'] = array(
- '#value' => t('Required by: !required', array('!required' => implode(', ', $dependents))),
+ '#markup' => t('Required by: !required', array('!required' => implode(', ', $dependents))),
'#prefix' => '',
'#suffix' => '
',
);
@@ -811,7 +811,7 @@
);
$items[] = format_plural(count($missing_dependencies), 'You must enable the @dependencies module to install @module.', 'You must enable the @dependencies modules to install @module.', $t_argument);
}
- $form['text'] = array('#value' => theme('item_list', $items));
+ $form['text'] = array('#markup' => theme('item_list', $items));
if ($form) {
// Set some default form values
@@ -991,8 +991,8 @@
// If the hook exists, the module can be uninstalled.
module_load_install($module->name);
if (module_hook($module->name, 'uninstall')) {
- $form['modules'][$module->name]['name'] = array('#value' => $info['name'] ? $info['name'] : $module->name);
- $form['modules'][$module->name]['description'] = array('#value' => t($info['description']));
+ $form['modules'][$module->name]['name'] = array('#markup' => $info['name'] ? $info['name'] : $module->name);
+ $form['modules'][$module->name]['description'] = array('#markup' => t($info['description']));
$options[$module->name] = '';
}
}
@@ -1044,7 +1044,7 @@
if (isset($uninstall)) {
$form['#confirmed'] = TRUE;
$form['uninstall']['#tree'] = TRUE;
- $form['modules'] = array('#value' => '' . t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') . '
' . theme('item_list', $uninstall));
+ $form['modules'] = array('#markup' => '' . t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') . '
' . theme('item_list', $uninstall));
$form = confirm_form(
$form,
t('Confirm uninstall'),
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.605
diff -u -r1.605 system.module
--- modules/system/system.module 1 Jul 2008 20:36:40 -0000 1.605
+++ modules/system/system.module 5 Jul 2008 03:30:05 -0000
@@ -291,7 +291,7 @@
* Form structure.
*/
$type['item'] = array(
- '#value' => '',
+ '#markup' => '',
);
$type['hidden'] = array(
@@ -868,8 +868,8 @@
$screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot');
- $form['themes'][$info->key]['screenshot'] = array('#value' => $screenshot);
- $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? '
' . t('(site default theme)') . '' : ''));
+ $form['themes'][$info->key]['screenshot'] = array('#markup' => $screenshot);
+ $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#markup' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? '
' . t('(site default theme)') . '' : ''));
$options[$info->key] = '';
}
@@ -1305,12 +1305,12 @@
$form['#skip_duplicate_check'] = TRUE;
$form['#attributes'] = array('class' => 'confirmation');
- $form['description'] = array('#value' => $description);
+ $form['description'] = array('#markup' => $description);
$form[$name] = array('#type' => 'hidden', '#value' => 1);
$form['actions'] = array('#prefix' => '', '#suffix' => '
');
$form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm'));
- $form['actions']['cancel'] = array('#value' => $cancel);
+ $form['actions']['cancel'] = array('#markup' => $cancel);
$form['#theme'] = 'confirm_form';
return $form;
}
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.466
diff -u -r1.466 book.module
--- modules/book/book.module 1 Jul 2008 20:52:55 -0000 1.466
+++ modules/book/book.module 5 Jul 2008 03:29:27 -0000
@@ -692,7 +692,7 @@
if (!$teaser) {
if (!empty($node->book['bid']) && $node->build_mode == NODE_BUILD_NORMAL) {
$node->content['book_navigation'] = array(
- '#value' => theme('book_navigation', $node->book),
+ '#markup' => theme('book_navigation', $node->book),
'#weight' => 100,
);
@@ -790,7 +790,7 @@
if (isset($node->book) && $node->book['has_children']) {
$form['book_warning'] = array(
- '#value' => '' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
',
+ '#markup' => '' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
',
'#weight' => -10,
);
}
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.5
diff -u -r1.5 simpletest.module
--- modules/simpletest/simpletest.module 26 Jun 2008 21:07:59 -0000 1.5
+++ modules/simpletest/simpletest.module 5 Jul 2008 03:29:55 -0000
@@ -132,7 +132,7 @@
'#collapsed' => $ok,
'#description' => $info['description'],
);
- $element['result_table']['#value'] = theme('table', $header, $element['result_table']['#rows']);
+ $element['result_table']['#markup'] = theme('table', $header, $element['result_table']['#rows']);
$element['summary']['#ok'] = $ok;
$group_ok = $group_ok && $ok;
}
Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.9
diff -u -r1.9 comment.admin.inc
--- modules/comment/comment.admin.inc 14 May 2008 13:12:40 -0000 1.9
+++ modules/comment/comment.admin.inc 5 Jul 2008 03:29:29 -0000
@@ -76,19 +76,19 @@
$comments[$comment->cid] = '';
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
$form['subject'][$comment->cid] = array(
- '#value' => l($comment->subject, 'node/' . $comment->nid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid))
+ '#markup' => l($comment->subject, 'node/' . $comment->nid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid))
);
$form['username'][$comment->cid] = array(
- '#value' => theme('username', $comment)
+ '#markup' => theme('username', $comment)
);
$form['node_title'][$comment->cid] = array(
- '#value' => l($comment->node_title, 'node/' . $comment->nid)
+ '#markup' => l($comment->node_title, 'node/' . $comment->nid)
);
$form['timestamp'][$comment->cid] = array(
- '#value' => format_date($comment->timestamp, 'small')
+ '#markup' => format_date($comment->timestamp, 'small')
);
$form['operations'][$comment->cid] = array(
- '#value' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination))
+ '#markup' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination))
);
}
$form['comments'] = array(
@@ -96,7 +96,7 @@
'#options' => isset($comments) ? $comments: array()
);
$form['pager'] = array(
- '#value' => theme('pager', NULL, 50, 0)
+ '#markup' => theme('pager', NULL, 50, 0)
);
return $form;
@@ -169,7 +169,7 @@
}
$output .= theme('table', $form['header']['#value'], $rows);
- if ($form['pager']['#value']) {
+ if ($form['pager']['#markup']) {
$output .= drupal_render($form['pager']);
}
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.642
diff -u -r1.642 comment.module
--- modules/comment/comment.module 3 Jul 2008 17:57:03 -0000 1.642
+++ modules/comment/comment.module 5 Jul 2008 03:29:33 -0000
@@ -1267,7 +1267,7 @@
$form['_author'] = array(
'#type' => 'item',
'#title' => t('Your name'),
- '#value' => theme('username', $user),
+ '#markup' => theme('username', $user),
);
$form['author'] = array(
'#type' => 'value',
@@ -1452,7 +1452,7 @@
}
$form['comment_preview'] = array(
- '#value' => $output,
+ '#markup' => $output,
'#weight' => -100,
'#prefix' => '',
'#suffix' => '
',
@@ -1473,7 +1473,7 @@
}
$form['comment_preview_below'] = array(
- '#value' => $output,
+ '#markup' => $output,
'#weight' => 100,
);
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.306
diff -u -r1.306 blog.module
--- modules/blog/blog.module 22 May 2008 19:27:13 -0000 1.306
+++ modules/blog/blog.module 5 Jul 2008 03:29:25 -0000
@@ -49,7 +49,7 @@
$user->content['summary']['blog'] = array(
'#type' => 'user_profile_item',
'#title' => t('Blog'),
- '#value' => l(t('View recent blog entries'), "blog/$user->uid", array('attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $user->name))))),
+ '#markup' => l(t('View recent blog entries'), "blog/$user->uid", array('attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $user->name))))),
'#attributes' => array('class' => 'blog'),
);
}
@@ -204,4 +204,3 @@
}
}
}
-
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.26
diff -u -r1.26 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc 12 Jun 2008 19:07:36 -0000 1.26
+++ modules/taxonomy/taxonomy.admin.inc 5 Jul 2008 03:30:07 -0000
@@ -23,12 +23,12 @@
$types[] = $node_type ? check_plain($node_type) : check_plain($type);
}
$form[$vocabulary->vid]['#vocabulary'] = (array)$vocabulary;
- $form[$vocabulary->vid]['name'] = array('#value' => check_plain($vocabulary->name));
- $form[$vocabulary->vid]['types'] = array('#value' => implode(', ', $types));
+ $form[$vocabulary->vid]['name'] = array('#markup' => check_plain($vocabulary->name));
+ $form[$vocabulary->vid]['types'] = array('#markup' => implode(', ', $types));
$form[$vocabulary->vid]['weight'] = array('#type' => 'weight', '#delta' => 10, '#default_value' => $vocabulary->weight);
- $form[$vocabulary->vid]['edit'] = array('#value' => l(t('edit vocabulary'), "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid"));
- $form[$vocabulary->vid]['list'] = array('#value' => l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid"));
- $form[$vocabulary->vid]['add'] = array('#value' => l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term"));
+ $form[$vocabulary->vid]['edit'] = array('#markup' => l(t('edit vocabulary'), "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid"));
+ $form[$vocabulary->vid]['list'] = array('#markup' => l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid"));
+ $form[$vocabulary->vid]['add'] = array('#markup' => l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term"));
}
// Only make this form include a submit button and weight if more than one
@@ -387,7 +387,7 @@
unset($form[$key]['#term']['parents'], $term->parents);
}
- $form[$key]['view'] = array('#value' => l($term->name, "taxonomy/term/$term->tid"));
+ $form[$key]['view'] = array('#markup' => l($term->name, "taxonomy/term/$term->tid"));
if (!$vocabulary->tags && $vocabulary->hierarchy < 2 && count($tree) > 1) {
$form['#parent_fields'] = TRUE;
$form[$key]['tid'] = array(
@@ -405,7 +405,7 @@
'#default_value' => $term->depth,
);
}
- $form[$key]['edit'] = array('#value' => l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => drupal_get_destination())));
+ $form[$key]['edit'] = array('#markup' => l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => drupal_get_destination())));
}
$form['#total_entries'] = $total_entries;
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.122
diff -u -r1.122 install.php
--- install.php 3 Jul 2008 17:57:03 -0000 1.122
+++ install.php 5 Jul 2008 03:29:02 -0000
@@ -231,7 +231,7 @@
if (count($db_types) == 0) {
$form['no_db_types'] = array(
- '#value' => st('Your web server does not appear to support any common database types. Check with your hosting provider to see if they offer any databases that Drupal supports.', array('@drupal-databases' => 'http://drupal.org/node/270#database')),
+ '#markup' => st('Your web server does not appear to support any common database types. Check with your hosting provider to see if they offer any databases that Drupal supports.', array('@drupal-databases' => 'http://drupal.org/node/270#database')),
);
}
else {
@@ -995,7 +995,7 @@
function install_configure_form(&$form_state, $url) {
$form['intro'] = array(
- '#value' => st('To configure your website, please provide the following information.'),
+ '#markup' => st('To configure your website, please provide the following information.'),
'#weight' => -10,
);
$form['site_information'] = array(
@@ -1024,7 +1024,7 @@
);
$form['admin_account']['account']['#tree'] = TRUE;
$form['admin_account']['markup'] = array(
- '#value' => '' . st('The administrator account has complete access to the site; it will automatically be granted all permissions and can perform any administrative activity. This will be the only account that can perform certain activities, so keep its credentials safe.') . '
',
+ '#markup' => '' . st('The administrator account has complete access to the site; it will automatically be granted all permissions and can perform any administrative activity. This will be the only account that can perform certain activities, so keep its credentials safe.') . '
',
'#weight' => -10,
);
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.254
diff -u -r1.254 update.php
--- update.php 14 Apr 2008 17:48:33 -0000 1.254
+++ update.php 5 Jul 2008 03:29:04 -0000
@@ -223,7 +223,7 @@
$last_removed = module_invoke($module, 'update_last_removed');
if ($schema_version < $last_removed) {
$form['start'][$module] = array(
- '#value' => '' . $module . ' module can not be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update ' . $module . ' module, you will first need to upgrade to the last version in which these updates were available.',
+ '#markup' => '' . $module . ' module can not be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update ' . $module . ' module, you will first need to upgrade to the last version in which these updates were available.',
'#prefix' => '',
'#suffix' => '
',
);
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.268
diff -u -r1.268 poll.module
--- modules/poll/poll.module 15 May 2008 20:55:58 -0000 1.268
+++ modules/poll/poll.module 5 Jul 2008 03:29:53 -0000
@@ -552,12 +552,12 @@
if (!empty($node->allowvotes) && ($block || empty($node->show_results))) {
$node->content['body'] = array(
- '#value' => drupal_get_form('poll_view_voting', $node, $block),
+ '#markup' => drupal_get_form('poll_view_voting', $node, $block),
);
}
else {
$node->content['body'] = array(
- '#value' => poll_view_results($node, $teaser, $page, $block),
+ '#markup' => poll_view_results($node, $teaser, $page, $block),
);
}
return $node;
Index: modules/search/search.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.admin.inc,v
retrieving revision 1.5
diff -u -r1.5 search.admin.inc
--- modules/search/search.admin.inc 14 Apr 2008 17:48:41 -0000 1.5
+++ modules/search/search.admin.inc 5 Jul 2008 03:29:54 -0000
@@ -48,7 +48,7 @@
$percentage = ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) . '%';
$status = '' . t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) . ' ' . $count . '
';
$form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
- $form['status']['status'] = array('#value' => $status);
+ $form['status']['status'] = array('#markup' => $status);
$form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'));
$items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500));
@@ -58,7 +58,7 @@
$form['indexing_throttle']['search_cron_limit'] = array('#type' => 'select', '#title' => t('Number of items to index per cron run'), '#default_value' => variable_get('search_cron_limit', 100), '#options' => $items, '#description' => t('The maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing.', array('@cron' => url('admin/reports/status'))));
// Indexing settings:
$form['indexing_settings'] = array('#type' => 'fieldset', '#title' => t('Indexing settings'));
- $form['indexing_settings']['info'] = array('#value' => t('Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.
The default settings should be appropriate for the majority of sites.
'));
+ $form['indexing_settings']['info'] = array('#markup' => t('Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.
The default settings should be appropriate for the majority of sites.
'));
$form['indexing_settings']['minimum_word_size'] = array('#type' => 'textfield', '#title' => t('Minimum word length to index'), '#default_value' => variable_get('minimum_word_size', 3), '#size' => 5, '#maxlength' => 3, '#description' => t('The number of characters a word has to be to be indexed. A lower setting means better search result ranking, but also a larger database. Each search query must contain at least one keyword that is this size (or longer).'));
$form['indexing_settings']['overlap_cjk'] = array('#type' => 'checkbox', '#title' => t('Simple CJK handling'), '#default_value' => variable_get('overlap_cjk', TRUE), '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.'));