-
-
- '),
'#size' => 64,
@@ -740,7 +740,7 @@ function _filter_url_settings($format) {
'#collapsible' => TRUE,
);
$form['filter_urlfilter']['filter_url_length_' . $format] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Maximum link text length'),
'#default_value' => variable_get('filter_url_length_' . $format, 72),
'#maxlength' => 4,
Index: modules/forum/forum.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v
retrieving revision 1.24
diff -u -p -r1.24 forum.admin.inc
--- modules/forum/forum.admin.inc 30 Jul 2009 19:24:21 -0000 1.24
+++ modules/forum/forum.admin.inc 25 Aug 2009 14:41:35 -0000
@@ -34,7 +34,7 @@ function forum_form_forum(&$form_state,
'tid' => NULL,
'weight' => 0,
);
- $form['name'] = array('#type' => 'textfield',
+ $form['name'] = array('#type' => 'text',
'#title' => t('Forum name'),
'#default_value' => $edit['name'],
'#maxlength' => 255,
@@ -115,7 +115,7 @@ function forum_form_container(&$form_sta
// Handle a delete operation.
$form['name'] = array(
'#title' => t('Container name'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $edit['name'],
'#maxlength' => 255,
'#description' => t('Short but meaningful name for this collection of related forums.'),
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.514
diff -u -p -r1.514 forum.module
--- modules/forum/forum.module 24 Aug 2009 00:14:20 -0000 1.514
+++ modules/forum/forum.module 25 Aug 2009 14:41:37 -0000
@@ -548,7 +548,7 @@ function forum_block_view($delta = '') {
*/
function forum_form($node, $form_state) {
$type = node_type_get_type($node);
- $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
+ $form['title'] = array('#type' => 'text', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
if (!empty($node->nid)) {
$vid = variable_get('forum_nav_vocabulary', 0);
Index: modules/image/image.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v
retrieving revision 1.9
diff -u -p -r1.9 image.admin.inc
--- modules/image/image.admin.inc 24 Aug 2009 00:14:20 -0000 1.9
+++ modules/image/image.admin.inc 25 Aug 2009 14:41:37 -0000
@@ -45,7 +45,7 @@ function image_style_form(&$form_state,
// Allow the name of the style to be changed.
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#size' => '64',
'#title' => t('Image style name'),
'#default_value' => $style['name'],
@@ -187,7 +187,7 @@ function image_style_add_form(&$form_sta
$form = array();
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#size' => '64',
'#title' => t('Style name'),
'#default_value' => '',
@@ -431,7 +431,7 @@ function image_effect_scale_validate($el
*/
function image_resize_form($data) {
$form['width'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Width'),
'#default_value' => isset($data['width']) ? $data['width'] : '',
'#field_suffix' => ' ' . t('pixels'),
@@ -441,7 +441,7 @@ function image_resize_form($data) {
'#allow_negative' => FALSE,
);
$form['height'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Height'),
'#default_value' => isset($data['height']) ? $data['height'] : '',
'#field_suffix' => ' ' . t('pixels'),
@@ -529,7 +529,7 @@ function image_crop_form($data) {
*/
function image_rotate_form($data) {
$form['degrees'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => (isset($data['degrees'])) ? $data['degrees'] : 0,
'#title' => t('Rotation angle'),
'#description' => t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
@@ -541,7 +541,7 @@ function image_rotate_form($data) {
'#allow_negative' => TRUE,
);
$form['bgcolor'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => (isset($data['bgcolor'])) ? $data['bgcolor'] : '#FFFFFF',
'#title' => t('Background color'),
'#description' => t('The background color to use for exposed areas of the image. Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave blank for transparency on image types that support it.'),
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.56
diff -u -p -r1.56 menu.admin.inc
--- modules/menu/menu.admin.inc 24 Aug 2009 01:49:41 -0000 1.56
+++ modules/menu/menu.admin.inc 25 Aug 2009 14:41:37 -0000
@@ -106,7 +106,7 @@ function _menu_overview_tree_form($tree)
'#value' => $item['mlid'],
);
$form[$mlid]['plid'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => isset($form_state[$mlid]['plid']) ? $form_state[$mlid]['plid'] : $item['plid'],
'#size' => 6,
);
@@ -258,7 +258,7 @@ function menu_edit_item(&$form_state, $t
// This is an add form, initialize the menu link.
$item = array('link_title' => '', 'mlid' => 0, 'plid' => 0, 'menu_name' => $menu['menu_name'], 'weight' => 0, 'link_path' => '', 'options' => array(), 'module' => 'menu', 'expanded' => 0, 'hidden' => 0, 'has_children' => 0);
}
- $form['menu']['link_title'] = array('#type' => 'textfield',
+ $form['menu']['link_title'] = array('#type' => 'text',
'#title' => t('Menu link title'),
'#default_value' => $item['link_title'],
'#description' => t('The text to be used for this link in the menu.'),
@@ -280,7 +280,7 @@ function menu_edit_item(&$form_state, $t
}
if ($item['module'] == 'menu') {
$form['menu']['link_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Path'),
'#default_value' => $path,
'#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '
', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')),
@@ -414,7 +414,7 @@ function menu_edit_menu(&$form_state, $t
}
else {
$form['title'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Title'),
'#default_value' => $menu['title'],
'#required' => TRUE,
@@ -443,7 +443,7 @@ function menu_edit_menu(&$form_state, $t
),
);
$form['menu_name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Menu name'),
'#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI,
'#description' => t('This text will be used to construct the URL for the menu. The name must contain only lowercase letters, numbers and hyphens, and must be unique.'),
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.200
diff -u -p -r1.200 menu.module
--- modules/menu/menu.module 24 Aug 2009 00:14:21 -0000 1.200
+++ modules/menu/menu.module 25 Aug 2009 14:41:37 -0000
@@ -435,7 +435,7 @@ function menu_form_alter(&$form, $form_s
}
$form['menu']['#item'] = $item;
- $form['menu']['link_title'] = array('#type' => 'textfield',
+ $form['menu']['link_title'] = array('#type' => 'text',
'#title' => t('Menu link title'),
'#default_value' => $item['link_title'],
'#description' => t('The link text corresponding to this item that should appear in the menu. Leave blank if you do not wish to add this post to the menu.'),
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.91
diff -u -p -r1.91 content_types.inc
--- modules/node/content_types.inc 24 Aug 2009 19:26:46 -0000 1.91
+++ modules/node/content_types.inc 25 Aug 2009 14:41:37 -0000
@@ -72,7 +72,7 @@ function node_type_form(&$form_state, $t
);
$form['identity']['name'] = array(
'#title' => t('Name'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $type->name,
'#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the add new content page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'),
'#required' => TRUE,
@@ -96,7 +96,7 @@ function node_type_form(&$form_state, $t
);
$form['identity']['type'] = array(
'#title' => t('Machine name'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $type->type,
'#maxlength' => 32,
'#required' => TRUE,
@@ -129,7 +129,7 @@ function node_type_form(&$form_state, $t
);
$form['submission']['title_label'] = array(
'#title' => t('Title field label'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $type->title_label,
'#required' => TRUE,
);
@@ -142,7 +142,7 @@ function node_type_form(&$form_state, $t
}
$form['submission']['body_label'] = array(
'#title' => t('Body field label'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => isset($type->body_label) ? $type->body_label : '',
'#description' => t('To remove the body field, remove text and leave blank.'),
);
Index: modules/node/node.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.api.php,v
retrieving revision 1.36
diff -u -p -r1.36 node.api.php
--- modules/node/node.api.php 20 Aug 2009 10:56:33 -0000 1.36
+++ modules/node/node.api.php 25 Aug 2009 14:41:37 -0000
@@ -799,7 +799,7 @@ function hook_form($node, $form_state) {
$type = node_type_get_type($node);
$form['title'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => check_plain($type->title_label),
'#required' => TRUE,
);
@@ -810,7 +810,7 @@ function hook_form($node, $form_state) {
'#required' => TRUE,
);
$form['field1'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Custom field'),
'#default_value' => $node->field1,
'#maxlength' => 127,
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1111
diff -u -p -r1.1111 node.module
--- modules/node/node.module 25 Aug 2009 02:48:16 -0000 1.1111
+++ modules/node/node.module 25 Aug 2009 14:41:38 -0000
@@ -2144,19 +2144,19 @@ function node_form_search_form_alter(&$f
'#suffix' => '',
);
$form['advanced']['keywords']['or'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Containing any of the words'),
'#size' => 30,
'#maxlength' => 255,
);
$form['advanced']['keywords']['phrase'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Containing the phrase'),
'#size' => 30,
'#maxlength' => 255,
);
$form['advanced']['keywords']['negative'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Containing none of the words'),
'#size' => 30,
'#maxlength' => 255,
@@ -2915,7 +2915,7 @@ function node_content_form($node, $form_
if ($type->has_title) {
$form['title'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => check_plain($type->title_label),
'#required' => TRUE,
'#default_value' => $node->title,
@@ -3178,7 +3178,7 @@ function node_assign_owner_action_form($
}
else {
$form['owner_name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Username'),
'#default_value' => $owner_name,
'#autocomplete_path' => 'user/autocomplete',
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.78
diff -u -p -r1.78 node.pages.inc
--- modules/node/node.pages.inc 25 Aug 2009 10:27:14 -0000 1.78
+++ modules/node/node.pages.inc 25 Aug 2009 14:41:38 -0000
@@ -202,7 +202,7 @@ function node_form(&$form_state, $node)
'#weight' => 90,
);
$form['author']['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Authored by'),
'#maxlength' => 60,
'#autocomplete_path' => 'user/autocomplete',
@@ -211,7 +211,7 @@ function node_form(&$form_state, $node)
'#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
);
$form['author']['date'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Authored on'),
'#maxlength' => 25,
'#description' => t('Format: %time. The date format is YYYY-MM-DD and %timezone is the timezone offset from UTC. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'Y-m-d H:i:s O'), '%timezone' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'O'))),
Index: modules/openid/openid.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v
retrieving revision 1.56
diff -u -p -r1.56 openid.module
--- modules/openid/openid.module 24 Aug 2009 00:14:21 -0000 1.56
+++ modules/openid/openid.module 25 Aug 2009 14:41:38 -0000
@@ -114,7 +114,7 @@ function _openid_user_login_form_alter(&
$form['links']['#weight'] = 2;
$form['openid_identifier'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Log in using OpenID'),
'#size' => $form['name']['#size'],
'#maxlength' => 255,
Index: modules/openid/openid.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.pages.inc,v
retrieving revision 1.19
diff -u -p -r1.19 openid.pages.inc
--- modules/openid/openid.pages.inc 29 Jul 2009 06:39:34 -0000 1.19
+++ modules/openid/openid.pages.inc 25 Aug 2009 14:41:38 -0000
@@ -70,7 +70,7 @@ function openid_user_identities($account
*/
function openid_user_add() {
$form['openid_identifier'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('OpenID'),
);
$form['submit'] = array('#type' => 'submit', '#value' => t('Add an OpenID'));
Index: modules/path/path.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v
retrieving revision 1.28
diff -u -p -r1.28 path.admin.inc
--- modules/path/path.admin.inc 22 Aug 2009 14:34:21 -0000 1.28
+++ modules/path/path.admin.inc 25 Aug 2009 14:41:38 -0000
@@ -103,7 +103,7 @@ function path_admin_form(&$form_state, $
$form['#alias'] = $edit;
$form['src'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Existing system path'),
'#default_value' => $edit['src'],
'#maxlength' => 255,
@@ -113,7 +113,7 @@ function path_admin_form(&$form_state, $
'#required' => TRUE,
);
$form['dst'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Path alias'),
'#default_value' => $edit['dst'],
'#maxlength' => 255,
@@ -216,7 +216,7 @@ function path_admin_filter_form(&$form_s
);
$form['basic']['inline'] = array('#prefix' => '', '#suffix' => '');
$form['basic']['inline']['filter'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => '',
'#default_value' => $keys,
'#maxlength' => 128,
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.168
diff -u -p -r1.168 path.module
--- modules/path/path.module 24 Aug 2009 00:14:21 -0000 1.168
+++ modules/path/path.module 25 Aug 2009 14:41:39 -0000
@@ -239,7 +239,7 @@ function path_form_alter(&$form, $form_s
'#weight' => 30,
);
$form['path']['path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('URL alias'),
'#default_value' => $path,
'#maxlength' => 255,
@@ -285,7 +285,7 @@ function path_form_taxonomy_form_term_al
$form['#validate'][] = 'path_taxonomy_term_validate';
$form['#submit'][] = 'path_taxonomy_term_submit';
$form['identification']['path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('URL alias'),
'#default_value' => $path,
'#maxlength' => 255,
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.310
diff -u -p -r1.310 poll.module
--- modules/poll/poll.module 24 Aug 2009 00:14:21 -0000 1.310
+++ modules/poll/poll.module 25 Aug 2009 14:41:39 -0000
@@ -223,7 +223,7 @@ function poll_form($node, $form_state) {
);
$form['title'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => check_plain($type->title_label),
'#required' => TRUE,
'#default_value' => $node->title,
@@ -352,13 +352,13 @@ function _poll_choice_form($key, $chid =
);
$form['chtext'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $value,
'#parents' => array('choice', $key, 'chtext'),
);
$form['chvotes'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $votes,
'#size' => 5,
'#maxlength' => 7,
Index: modules/profile/profile-block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile-block.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 profile-block.tpl.php
--- modules/profile/profile-block.tpl.php 6 Aug 2009 05:05:59 -0000 1.4
+++ modules/profile/profile-block.tpl.php 25 Aug 2009 14:41:39 -0000
@@ -13,7 +13,7 @@
* Each $field in $profile contains:
* - $field->title: Title of the profile field.
* - $field->value: Value of the profile field.
- * - $field->type: Type of the profile field, i.e., checkbox, textfield,
+ * - $field->type: Type of the profile field, i.e., checkbox, text,
* textarea, selection, list, url or date.
*
* Since $profile is keyed, a direct print of the field is possible. Not
Index: modules/profile/profile-listing.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile-listing.tpl.php,v
retrieving revision 1.7
diff -u -p -r1.7 profile-listing.tpl.php
--- modules/profile/profile-listing.tpl.php 6 Aug 2009 05:05:59 -0000 1.7
+++ modules/profile/profile-listing.tpl.php 25 Aug 2009 14:41:39 -0000
@@ -20,7 +20,7 @@
* Each $field in $profile contains:
* - $field->title: Title of the profile field.
* - $field->value: Value of the profile field.
- * - $field->type: Type of the profile field, i.e., checkbox, textfield,
+ * - $field->type: Type of the profile field, i.e., checkbox, text,
* textarea, selection, list, url or date.
*
* Since $profile is keyed, a direct print of the field is possible. Not
Index: modules/profile/profile.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v
retrieving revision 1.29
diff -u -p -r1.29 profile.admin.inc
--- modules/profile/profile.admin.inc 22 Aug 2009 14:34:21 -0000 1.29
+++ modules/profile/profile.admin.inc 25 Aug 2009 14:41:39 -0000
@@ -216,20 +216,20 @@ function profile_field_form(&$form_state
$form['fields'] = array('#type' => 'fieldset',
'#title' => t('Field settings'),
);
- $form['fields']['category'] = array('#type' => 'textfield',
+ $form['fields']['category'] = array('#type' => 'text',
'#title' => t('Category'),
'#default_value' => $edit['category'],
'#autocomplete_path' => 'admin/config/people/profile/autocomplete',
'#description' => t('The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".'),
'#required' => TRUE,
);
- $form['fields']['title'] = array('#type' => 'textfield',
+ $form['fields']['title'] = array('#type' => 'text',
'#title' => t('Title'),
'#default_value' => $edit['title'],
'#description' => t('The title of the new field. The title will be shown to the user. An example title is "Favorite color".'),
'#required' => TRUE,
);
- $form['fields']['name'] = array('#type' => 'textfield',
+ $form['fields']['name'] = array('#type' => 'text',
'#title' => t('Form name'),
'#default_value' => $edit['name'],
'#description' => t('The name of the field. The form name is not shown to the user but used internally in the HTML code and URLs.
@@ -253,15 +253,15 @@ Unless you know what you are doing, it i
'#default_value' => isset($edit['visibility']) ? $edit['visibility'] : PROFILE_PUBLIC,
'#options' => array(PROFILE_HIDDEN => t('Hidden profile field, only accessible by administrators, modules and themes.'), PROFILE_PRIVATE => t('Private field, content only available to privileged users.'), PROFILE_PUBLIC => t('Public field, content shown on profile page but not used on member list pages.'), PROFILE_PUBLIC_LISTINGS => t('Public field, content shown on profile page and on member list pages.')),
);
- if ($type == 'selection' || $type == 'list' || $type == 'textfield') {
- $form['fields']['page'] = array('#type' => 'textfield',
+ if ($type == 'selection' || $type == 'list' || $type == 'text') {
+ $form['fields']['page'] = array('#type' => 'text',
'#title' => t('Page title'),
'#default_value' => $edit['page'],
'#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word %value will be substituted with the corresponding value. An example page title is "People whose favorite color is %value" . This is only applicable for a public field.'),
);
}
elseif ($type == 'checkbox') {
- $form['fields']['page'] = array('#type' => 'textfield',
+ $form['fields']['page'] = array('#type' => 'text',
'#title' => t('Page title'),
'#default_value' => $edit['page'],
'#description' => t('To enable browsing this field by value, enter a title for the resulting page. An example page title is "People who are employed" . This is only applicable for a public field.'),
Index: modules/profile/profile.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.install,v
retrieving revision 1.20
diff -u -p -r1.20 profile.install
--- modules/profile/profile.install 1 Jun 2009 22:07:09 -0000 1.20
+++ modules/profile/profile.install 25 Aug 2009 14:41:39 -0000
@@ -167,3 +167,10 @@ function profile_update_7001() {
db_rename_table($ret, 'profile_values', 'profile_value');
return $ret;
}
+
+function profile_update_7002() {
+ $ret = array();
+ $ret[] = update_sql("UPDATE {profile_field} SET type = 'text' WHERE type = 'textfield'");
+ db_change_field($ret, 'profile_field', 'type', 'type', array('type' => 'varchar', 'length' => 128, 'not null' => FALSE));
+ return $ret;
+}
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.271
diff -u -p -r1.271 profile.module
--- modules/profile/profile.module 24 Aug 2009 00:14:21 -0000 1.271
+++ modules/profile/profile.module 25 Aug 2009 14:41:39 -0000
@@ -34,8 +34,8 @@ function profile_help($path, $arg) {
case 'admin/help#profile':
$output = '' . t('The profile module allows custom fields (such as country, full name, or age) to be defined and displayed in the My Account section. This permits users of a site to share more information about themselves, and can help community-based sites organize users around specific information.') . '
';
$output .= '' . t('The following types of fields can be added to a user profile:') . '
';
- $output .= '- ' . t('single-line textfield') . '
';
- $output .= '- ' . t('multi-line textfield') . '
';
+ $output .= '- ' . t('single-line text') . '
';
+ $output .= '- ' . t('multi-line text') . '
';
$output .= '- ' . t('checkbox') . '
';
$output .= '- ' . t('list selection') . '
';
$output .= '- ' . t('freeform list') . '
';
@@ -293,7 +293,7 @@ function profile_view_field($account, $f
switch ($field->type) {
case 'textarea':
return check_markup($value);
- case 'textfield':
+ case 'text':
case 'selection':
return $browse ? l($value, 'profile/' . $field->name . '/' . $value) : check_plain($value);
case 'checkbox':
@@ -388,9 +388,9 @@ function profile_form_profile($edit, $ac
$fields[$category] = array('#type' => 'fieldset', '#title' => check_plain($category), '#weight' => $weight++);
}
switch ($field->type) {
- case 'textfield':
+ case 'text':
case 'url':
- $fields[$category][$field->name] = array('#type' => 'textfield',
+ $fields[$category][$field->name] = array('#type' => 'text',
'#title' => check_plain($field->title),
'#default_value' => isset($edit[$field->name]) ? $edit[$field->name] : '',
'#maxlength' => 255,
@@ -585,8 +585,8 @@ function template_preprocess_profile_wra
}
function _profile_field_types($type = NULL) {
- $types = array('textfield' => t('single-line textfield'),
- 'textarea' => t('multi-line textfield'),
+ $types = array('text' => t('single-line text'),
+ 'textarea' => t('multi-line text'),
'checkbox' => t('checkbox'),
'selection' => t('list selection'),
'list' => t('freeform list'),
Index: modules/profile/profile.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v
retrieving revision 1.18
diff -u -p -r1.18 profile.pages.inc
--- modules/profile/profile.pages.inc 26 May 2009 10:41:06 -0000 1.18
+++ modules/profile/profile.pages.inc 25 Aug 2009 14:41:39 -0000
@@ -48,7 +48,7 @@ function profile_browse() {
case 'checkbox':
$query->condition('v.value', 1);
break;
- case 'textfield':
+ case 'text':
case 'selection':
$query->condition('v.value', $value);
break;
@@ -76,7 +76,7 @@ function profile_browse() {
$output = theme('profile_wrapper', $content);
$output .= theme('pager', NULL);
- if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') {
+ if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'text') {
$title = strtr(check_plain($field->page), array('%value' => theme('placeholder', $value)));
}
else {
Index: modules/profile/profile.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v
retrieving revision 1.19
diff -u -p -r1.19 profile.test
--- modules/profile/profile.test 21 Aug 2009 14:27:45 -0000 1.19
+++ modules/profile/profile.test 25 Aug 2009 14:41:40 -0000
@@ -30,7 +30,7 @@ class ProfileTestCase extends DrupalWebT
* @return
* The fid of the field that was just created.
*/
- function createProfileField($type = 'textfield', $category = 'simpletest', $edit = array()) {
+ function createProfileField($type = 'text', $category = 'simpletest', $edit = array()) {
$edit['title'] = $title = $this->randomName(8);
$edit['name'] = $form_name = 'profile_' . $title;
$edit['category'] = $category;
@@ -117,7 +117,7 @@ class ProfileTestFields extends ProfileT
public static function getInfo() {
return array(
'name' => 'Test single fields',
- 'description' => 'Testing profile module with add/edit/delete textfield, textarea, list, checkbox, and url fields into profile page',
+ 'description' => 'Testing profile module with add/edit/delete text, textarea, list, checkbox, and url fields into profile page',
'group' => 'Profile'
);
}
@@ -131,7 +131,7 @@ class ProfileTestFields extends ProfileT
// Set test values for every field type.
$field_types = array(
- 'textfield' => $this->randomName(),
+ 'text' => $this->randomName(),
'textarea' => $this->randomName(),
'list' => $this->randomName(),
'checkbox' => 1,
@@ -225,8 +225,8 @@ class ProfileTestWeights extends Profile
$this->drupalLogin($this->admin_user);
$category = $this->randomName();
- $field1 = $this->createProfileField('textfield', $category, array('weight' => 1));
- $field2 = $this->createProfileField('textfield', $category, array('weight' => -1));
+ $field1 = $this->createProfileField('text', $category, array('weight' => 1));
+ $field2 = $this->createProfileField('text', $category, array('weight' => -1));
$this->setProfileField($field1, $this->randomName(8));
$this->setProfileField($field2, $this->randomName(8));
@@ -259,7 +259,7 @@ class ProfileTestAutocomplete extends Pr
// Create a new profile field with autocompletion enabled.
$category = $this->randomName();
- $field = $this->createProfileField('textfield', $category, array('weight' => 1, 'autocomplete' => 1));
+ $field = $this->createProfileField('text', $category, array('weight' => 1, 'autocomplete' => 1));
// Enter profile field value.
$field['value'] = $this->randomName();
Index: modules/search/search.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 search.admin.inc
--- modules/search/search.admin.inc 24 Aug 2009 22:03:01 -0000 1.10
+++ modules/search/search.admin.inc 25 Aug 2009 14:41:40 -0000
@@ -74,7 +74,7 @@ function search_admin_settings() {
'#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',
+ '#type' => 'text',
'#title' => t('Minimum word length to index'),
'#default_value' => 3,
'#size' => 5,
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.308
diff -u -p -r1.308 search.module
--- modules/search/search.module 24 Aug 2009 22:03:01 -0000 1.308
+++ modules/search/search.module 25 Aug 2009 14:41:40 -0000
@@ -1081,7 +1081,7 @@ function search_form(&$form_state, $acti
$form['basic'] = array('#type' => 'item', '#title' => $prompt, '#id' => 'edit-keys');
$form['basic']['inline'] = array('#prefix' => '', '#suffix' => '');
$form['basic']['inline']['keys'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => '',
'#default_value' => $keys,
'#size' => $prompt ? 40 : 20,
@@ -1106,7 +1106,7 @@ function search_form(&$form_state, $acti
function search_box(&$form_state, $form_id) {
$form[$form_id] = array(
'#title' => t('Search this site'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#size' => 15,
'#default_value' => '',
'#attributes' => array('title' => t('Enter the terms you wish to search for.')),
Index: modules/simpletest/simpletest.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v
retrieving revision 1.15
diff -u -p -r1.15 simpletest.pages.inc
--- modules/simpletest/simpletest.pages.inc 22 Aug 2009 14:34:21 -0000 1.15
+++ modules/simpletest/simpletest.pages.inc 25 Aug 2009 14:41:40 -0000
@@ -443,12 +443,12 @@ function simpletest_settings_form(&$form
'#description' => t('HTTP auth settings to be used by the SimpleTest browser during testing. Useful when the site requires basic HTTP authentication.'),
);
$form['httpauth']['simpletest_username'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Username'),
'#default_value' => variable_get('simpletest_username', ''),
);
$form['httpauth']['simpletest_password'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Password'),
'#default_value' => variable_get('simpletest_password', ''),
);
Index: modules/simpletest/tests/browser_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/browser_test.module,v
retrieving revision 1.1
diff -u -p -r1.1 browser_test.module
--- modules/simpletest/tests/browser_test.module 17 Aug 2009 06:08:47 -0000 1.1
+++ modules/simpletest/tests/browser_test.module 25 Aug 2009 14:41:40 -0000
@@ -43,7 +43,7 @@ function browser_test_print_post_form(&$
$form = array();
$form['foo'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
);
$form['op'] = array(
'#type' => 'submit',
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.16
diff -u -p -r1.16 field_test.module
--- modules/simpletest/tests/field_test.module 22 Aug 2009 00:58:54 -0000 1.16
+++ modules/simpletest/tests/field_test.module 25 Aug 2009 14:41:40 -0000
@@ -341,7 +341,7 @@ function field_test_entity_form_submit_b
/**
* Implement hook_field_info().
*
- * This field provides a textfield which only accepts the value 1.
+ * This field provides a text field which only accepts the value 1.
*/
function field_test_field_info() {
return array(
@@ -497,7 +497,7 @@ function field_test_field_widget(&$form,
$element = array(
'value' => array(
'#title' => $instance['label'],
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : '',
'#required' => $instance['required'],
),
Index: modules/simpletest/tests/file_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file_test.module,v
retrieving revision 1.13
diff -u -p -r1.13 file_test.module
--- modules/simpletest/tests/file_test.module 19 Aug 2009 08:38:09 -0000 1.13
+++ modules/simpletest/tests/file_test.module 25 Aug 2009 14:41:41 -0000
@@ -55,7 +55,7 @@ function _file_test_form(&$form_state) {
'#default_value' => FILE_EXISTS_RENAME,
);
$form['file_subdir'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => 'Subdirectory for test image',
'#default_value' => '',
);
Index: modules/simpletest/tests/form.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form.test,v
retrieving revision 1.14
diff -u -p -r1.14 form.test
--- modules/simpletest/tests/form.test 13 Jul 2009 21:51:41 -0000 1.14
+++ modules/simpletest/tests/form.test 25 Aug 2009 14:41:41 -0000
@@ -27,8 +27,8 @@ class FormsTestCase extends DrupalWebTes
$empty_strings = array('""' => "", '"\n"' => "\n", '" "' => " ", '"\t"' => "\t", '" \n\t "' => " \n\t ", '"\n\n\n\n\n"' => "\n\n\n\n\n");
$empty_arrays = array('array()' => array());
- $elements['textfield']['element'] = array('#title' => $this->randomName(), '#type' => 'textfield', '#required' => TRUE);
- $elements['textfield']['empty_values'] = $empty_strings;
+ $elements['text']['element'] = array('#title' => $this->randomName(), '#type' => 'text', '#required' => TRUE);
+ $elements['text']['empty_values'] = $empty_strings;
$elements['password']['element'] = array('#title' => $this->randomName(), '#type' => 'password', '#required' => TRUE);
$elements['password']['empty_values'] = $empty_strings;
Index: modules/simpletest/tests/form_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form_test.module,v
retrieving revision 1.8
diff -u -p -r1.8 form_test.module
--- modules/simpletest/tests/form_test.module 17 Aug 2009 07:12:16 -0000 1.8
+++ modules/simpletest/tests/form_test.module 25 Aug 2009 14:41:41 -0000
@@ -261,13 +261,13 @@ function form_test_batch_callback($value
}
/**
- * A simple form with a textfield and submit button.
+ * A simple form with a text field and submit button.
*/
function form_test_mock_form($form_state) {
$form = array();
$form['test_value'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => 'initial_state',
);
@@ -319,13 +319,13 @@ function form_storage_test_form(&$form_s
if ($form_state['storage']['step'] == 1) {
$form['title'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => 'title',
'#default_value' => $form_state['storage']['thing']['title'],
'#required' => TRUE,
);
$form['value'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => 'value',
'#default_value' => $form_state['storage']['thing']['value'],
);
Index: modules/simpletest/tests/taxonomy_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/taxonomy_test.module,v
retrieving revision 1.6
diff -u -p -r1.6 taxonomy_test.module
--- modules/simpletest/tests/taxonomy_test.module 3 Aug 2009 20:19:29 -0000 1.6
+++ modules/simpletest/tests/taxonomy_test.module 25 Aug 2009 14:41:41 -0000
@@ -62,7 +62,7 @@ function taxonomy_test_form_alter(&$form
if ($form_id == 'taxonomy_form_term') {
$antonym = taxonomy_test_get_antonym($form['#term']['tid']);
$form['advanced']['antonym'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Antonym'),
'#default_value' => !empty($antonym) ? $antonym : '',
'#description' => t('Antonym of this term.')
Index: modules/system/image.gd.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/image.gd.inc,v
retrieving revision 1.11
diff -u -p -r1.11 image.gd.inc
--- modules/system/image.gd.inc 24 Aug 2009 00:14:22 -0000 1.11
+++ modules/system/image.gd.inc 25 Aug 2009 14:41:41 -0000
@@ -22,7 +22,7 @@ function image_gd_settings() {
);
$form['image_jpeg_quality'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('JPEG quality'),
'#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
'#size' => 10,
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.194
diff -u -p -r1.194 system.admin.inc
--- modules/system/system.admin.inc 25 Aug 2009 10:37:36 -0000 1.194
+++ modules/system/system.admin.inc 25 Aug 2009 14:41:42 -0000
@@ -488,7 +488,7 @@ function system_theme_settings(&$form_st
'#description' => t('Check here if you want the theme to use the logo supplied with it.')
);
$form['logo']['logo_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Path to custom logo'),
'#default_value' => $settings['logo_path'],
'#description' => t('The path to the file you would like to use as your logo file instead of the default logo.'));
@@ -514,7 +514,7 @@ function system_theme_settings(&$form_st
'#description' => t('Check here if you want the theme to use the default shortcut icon.')
);
$form['favicon']['favicon_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Path to custom icon'),
'#default_value' => $settings['favicon_path'],
'#description' => t('The path to the image file you would like to use as your custom shortcut icon.')
@@ -1186,7 +1186,7 @@ function system_ip_blocking() {
function system_ip_blocking_form($form_state) {
$form['ip'] = array(
'#title' => t('IP address'),
- '#type' => 'textfield',
+ '#type' => 'text',
'#size' => 64,
'#maxlength' => 32,
'#default_value' => arg(3),
@@ -1258,25 +1258,25 @@ function system_ip_blocking_delete_submi
*/
function system_site_information_settings() {
$form['site_name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Site name'),
'#default_value' => 'Drupal',
'#required' => TRUE
);
$form['site_mail'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('E-mail address'),
'#default_value' => ini_get('sendmail_from'),
'#description' => t("The From address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"),
'#required' => TRUE,
);
$form['site_slogan'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Slogan'),
'#default_value' => '',
);
$form['site_frontpage'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default front page'),
'#default_value' => 'node',
'#size' => 40,
@@ -1291,7 +1291,7 @@ function system_site_information_setting
'#description' => t('The maximum number of posts displayed on overview pages like the frontpage.')
);
$form['site_403'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default 403 (access denied) page'),
'#default_value' => '',
'#size' => 40,
@@ -1299,7 +1299,7 @@ function system_site_information_setting
'#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
);
$form['site_404'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default 404 (not found) page'),
'#default_value' => '',
'#size' => 40,
@@ -1479,7 +1479,7 @@ function system_clear_cache_submit($form
function system_file_system_settings() {
$form['file_public_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Public file system path'),
'#default_value' => file_directory_path(),
'#maxlength' => 255,
@@ -1488,7 +1488,7 @@ function system_file_system_settings() {
);
$form['file_private_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Private file system path'),
'#default_value' => file_directory_path('private'),
'#maxlength' => 255,
@@ -1497,7 +1497,7 @@ function system_file_system_settings() {
);
$form['file_temporary_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Temporary directory'),
'#default_value' => file_directory_path('temporary'),
'#maxlength' => 255,
@@ -1719,7 +1719,7 @@ function system_regional_settings() {
$form['date_formats']['date_format_short_custom'] = array(
'#prefix' => '',
'#suffix' => '',
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Custom short date format'),
'#attributes' => array('class' => array('custom-format')),
'#default_value' => $default_short_custom,
@@ -1741,7 +1741,7 @@ function system_regional_settings() {
$form['date_formats']['date_format_medium_custom'] = array(
'#prefix' => '',
'#suffix' => '',
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Custom medium date format'),
'#attributes' => array('class' => array('custom-format')),
'#default_value' => $default_medium_custom,
@@ -1763,7 +1763,7 @@ function system_regional_settings() {
$form['date_formats']['date_format_long_custom'] = array(
'#prefix' => '',
'#suffix' => '',
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Custom long date format'),
'#attributes' => array('class' => array('custom-format')),
'#default_value' => $default_long_custom,
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.63
diff -u -p -r1.63 system.api.php
--- modules/system/system.api.php 22 Aug 2009 15:26:04 -0000 1.63
+++ modules/system/system.api.php 25 Aug 2009 14:41:43 -0000
@@ -127,9 +127,9 @@ function hook_elements() {
* @see hook_elements()
*/
function hook_element_info_alter(&$type) {
- // Decrease the default size of textfields.
- if (isset($type['textfield']['#size'])) {
- $type['textfield']['#size'] = 40;
+ // Decrease the default size of text fields.
+ if (isset($type['text']['#size'])) {
+ $type['text']['#size'] = 40;
}
}
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.771
diff -u -p -r1.771 system.module
--- modules/system/system.module 25 Aug 2009 10:07:19 -0000 1.771
+++ modules/system/system.module 25 Aug 2009 14:41:44 -0000
@@ -322,13 +322,13 @@ function system_elements() {
'#theme_wrappers' => array('image_button'),
);
- $type['textfield'] = array(
+ $type['text'] = array(
'#input' => TRUE,
'#size' => 60,
'#maxlength' => 128,
'#autocomplete_path' => FALSE,
'#process' => array('form_process_text_format', 'ajax_process_form'),
- '#theme' => 'textfield',
+ '#theme' => 'text',
'#theme_wrappers' => array('form_element'),
);
@@ -1414,19 +1414,19 @@ function _system_filetransfer_backend_fo
$form = array();
$form['hostname'] = array (
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Host'),
'#default_value' => 'localhost',
);
$form['port'] = array (
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Port'),
'#default_value' => NULL,
);
$form['username'] = array (
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Username'),
);
@@ -2632,7 +2632,7 @@ function system_actions_configure($form_
}
$form['actions_description'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Description'),
'#default_value' => $edit['actions_description'],
'#maxlength' => '255',
@@ -2775,14 +2775,14 @@ function system_send_email_action_form($
}
$form['recipient'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Recipient'),
'#default_value' => $context['recipient'],
'#maxlength' => '254',
'#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if you would like to send an e-mail to the author of the original post.'),
);
$form['subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => $context['subject'],
'#maxlength' => '254',
@@ -2893,7 +2893,7 @@ function system_message_action(&$object,
*/
function system_goto_action_form($context) {
$form['url'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('URL'),
'#description' => t('The URL to which the user should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'),
'#default_value' => isset($context['url']) ? $context['url'] : '',
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.66
diff -u -p -r1.66 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc 23 Aug 2009 01:05:12 -0000 1.66
+++ modules/taxonomy/taxonomy.admin.inc 25 Aug 2009 14:41:44 -0000
@@ -125,7 +125,7 @@ function taxonomy_form_vocabulary(&$form
return taxonomy_vocabulary_confirm_delete($form_state, $form_state['values']['vid']);
}
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Name'),
'#default_value' => $edit['name'],
'#maxlength' => 255,
@@ -133,7 +133,7 @@ function taxonomy_form_vocabulary(&$form
'#field_suffix' => ' ',
);
$form['machine_name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Machine readable name'),
'#default_value' => $edit['machine_name'],
'#maxlength' => 255,
@@ -141,14 +141,14 @@ function taxonomy_form_vocabulary(&$form
'#required' => TRUE,
);
$form['help'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Help text'),
'#maxlength' => 255,
'#default_value' => $edit['help'],
'#description' => t('Instructions to present to the user when selecting terms, e.g., "Enter a comma separated list of words".'),
);
$form['description'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Description'),
'#default_value' => $edit['description'],
);
@@ -468,7 +468,7 @@ function taxonomy_overview_terms(&$form_
/**
* Submit handler for terms overview form.
*
- * Rather than using a textfield or weight field, this form depends entirely
+ * Rather than using a text or weight field, this form depends entirely
* upon the order of form elements on the page to determine new weights.
*
* Because there might be hundreds or thousands of taxonomy terms that need to
@@ -697,7 +697,7 @@ function taxonomy_form_term(&$form_state
'#collapsible' => TRUE,
);
$form['identification']['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Term name'),
'#default_value' => $edit['name'],
'#maxlength' => 255,
@@ -709,7 +709,7 @@ function taxonomy_form_term(&$form_state
'#description' => t('A description of the term. To be displayed on taxonomy/term pages and RSS feeds.'));
$form['vocabulary_machine_name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#access' => FALSE,
'#value' => isset($edit['vocabulary_machine_name']) ? $edit['vocabulary_machine_name'] : $vocabulary->name,
);
@@ -745,7 +745,7 @@ function taxonomy_form_term(&$form_state
'#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])),
'#description' => t('One synonym per line. Text input term selection widgets will show terms whose synonyms match the entered value as suggestions.'));
$form['advanced']['weight'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Weight'),
'#size' => 6,
'#default_value' => $edit['weight'],
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.504
diff -u -p -r1.504 taxonomy.module
--- modules/taxonomy/taxonomy.module 24 Aug 2009 21:00:23 -0000 1.504
+++ modules/taxonomy/taxonomy.module 25 Aug 2009 14:41:45 -0000
@@ -722,7 +722,7 @@ function taxonomy_form_alter(&$form, $fo
else {
$help = t('A comma-separated list of terms describing this content. Example: funny, bungee jumping, "Company, Inc."');
}
- $form['taxonomy']['tags'][$vocabulary->vid] = array('#type' => 'textfield',
+ $form['taxonomy']['tags'][$vocabulary->vid] = array('#type' => 'text',
'#title' => $vocabulary->name,
'#description' => $help,
'#required' => $vocabulary->required,
@@ -2190,7 +2190,7 @@ function taxonomy_autocomplete_elements_
$value = array();
$element[$field_key] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $typed_string,
'#autocomplete_path' => 'taxonomy/autocomplete/'. $element['#field_name'] .'/'. $element['#bundle'],
'#size' => $instance['widget']['settings']['size'],
Index: modules/trigger/tests/trigger_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/tests/trigger_test.module,v
retrieving revision 1.2
diff -u -p -r1.2 trigger_test.module
--- modules/trigger/tests/trigger_test.module 31 May 2009 03:12:19 -0000 1.2
+++ modules/trigger/tests/trigger_test.module 25 Aug 2009 14:41:45 -0000
@@ -56,7 +56,7 @@ function trigger_test_system_cron_conf_a
$context['subject'] = '';
}
$form['subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#default_value' => $context['subject'],
);
return $form;
Index: modules/upload/upload.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.admin.inc,v
retrieving revision 1.15
diff -u -p -r1.15 upload.admin.inc
--- modules/upload/upload.admin.inc 22 Aug 2009 09:48:34 -0000 1.15
+++ modules/upload/upload.admin.inc 25 Aug 2009 14:41:45 -0000
@@ -81,7 +81,7 @@ function upload_admin_settings() {
'#suffix' => '',
);
$form['settings_general']['upload_max_resolution']['upload_max_resolution_x'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Width'),
'#default_value' => variable_get('upload_max_resolution_x', 0),
'#size' => 5,
@@ -89,7 +89,7 @@ function upload_admin_settings() {
'#field_suffix' => t('x'),
);
$form['settings_general']['upload_max_resolution']['upload_max_resolution_y'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Height'),
'#default_value' => variable_get('upload_max_resolution_y', 0),
'#size' => 5,
@@ -105,14 +105,14 @@ function upload_admin_settings() {
);
$form['settings_general']['upload_extensions_default'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default permitted file extensions'),
'#default_value' => $upload_extensions_default,
'#maxlength' => 255,
'#description' => t('Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.'),
);
$form['settings_general']['upload_uploadsize_default'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default maximum file size per upload'),
'#default_value' => $upload_uploadsize_default,
'#size' => 5,
@@ -121,7 +121,7 @@ function upload_admin_settings() {
'#field_suffix' => t('MB'),
);
$form['settings_general']['upload_usersize_default'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default total file size per user'),
'#default_value' => $upload_usersize_default,
'#size' => 7,
@@ -143,14 +143,14 @@ function upload_admin_settings() {
'#collapsed' => TRUE,
);
$form['settings_role_' . $rid]['upload_extensions_' . $rid] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Permitted file extensions'),
'#default_value' => variable_get('upload_extensions_' . $rid, $upload_extensions_default),
'#maxlength' => 255,
'#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'),
);
$form['settings_role_' . $rid]['upload_uploadsize_' . $rid] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Maximum file size per upload'),
'#default_value' => variable_get('upload_uploadsize_' . $rid, $upload_uploadsize_default),
'#size' => 5,
@@ -159,7 +159,7 @@ function upload_admin_settings() {
'#field_suffix' => t('MB'),
);
$form['settings_role_' . $rid]['upload_usersize_' . $rid] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Total file size per user'),
'#default_value' => variable_get('upload_usersize_' . $rid, $upload_usersize_default),
'#size' => 7,
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.256
diff -u -p -r1.256 upload.module
--- modules/upload/upload.module 24 Aug 2009 00:14:22 -0000 1.256
+++ modules/upload/upload.module 25 Aug 2009 14:41:45 -0000
@@ -542,7 +542,7 @@ function _upload_form($node) {
$file = (object)$file;
$key = $file->fid;
- $form['files'][$key]['description'] = array('#type' => 'textfield', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => '' . file_create_url($file->uri) . '');
+ $form['files'][$key]['description'] = array('#type' => 'text', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => '' . file_create_url($file->uri) . '');
$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);
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.75
diff -u -p -r1.75 user.admin.inc
--- modules/user/user.admin.inc 24 Aug 2009 00:14:23 -0000 1.75
+++ modules/user/user.admin.inc 25 Aug 2009 14:41:46 -0000
@@ -244,7 +244,7 @@ function user_admin_settings() {
'#title' => t('Anonymous users'),
);
$form['anonymous_settings']['anonymous'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Name'),
'#default_value' => variable_get('anonymous', t('Anonymous')),
'#description' => t('The name used to indicate anonymous users.'),
@@ -348,7 +348,7 @@ function user_admin_settings() {
'#suffix' => '',
);
$form['personalization']['pictures']['user_picture_path'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Picture directory'),
'#default_value' => variable_get('user_picture_path', 'pictures'),
'#size' => 30,
@@ -356,7 +356,7 @@ function user_admin_settings() {
'#description' => t('Subdirectory in the directory %dir where pictures will be stored.', array('%dir' => file_directory_path() . '/')),
);
$form['personalization']['pictures']['user_picture_default'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Default picture'),
'#default_value' => variable_get('user_picture_default', ''),
'#size' => 30,
@@ -373,7 +373,7 @@ function user_admin_settings() {
);
}
$form['personalization']['pictures']['user_picture_dimensions'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Picture upload dimensions'),
'#default_value' => variable_get('user_picture_dimensions', '85x85'),
'#size' => 10,
@@ -382,7 +382,7 @@ function user_admin_settings() {
'#description' => t('Maximum allowed dimensions for uploaded pictures.'),
);
$form['personalization']['pictures']['user_picture_file_size'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Picture upload file size'),
'#default_value' => variable_get('user_picture_file_size', '30'),
'#size' => 10,
@@ -417,7 +417,7 @@ function user_admin_settings() {
'#group' => 'email',
);
$form['email_admin_created']['user_mail_register_admin_created_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('register_admin_created_subject'),
'#maxlength' => 180,
@@ -438,7 +438,7 @@ function user_admin_settings() {
'#group' => 'email',
);
$form['email_pending_approval']['user_mail_register_pending_approval_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('register_pending_approval_subject'),
'#maxlength' => 180,
@@ -459,7 +459,7 @@ function user_admin_settings() {
'#group' => 'email',
);
$form['email_no_approval_required']['user_mail_register_no_approval_required_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('register_no_approval_required_subject'),
'#maxlength' => 180,
@@ -481,7 +481,7 @@ function user_admin_settings() {
'#weight' => 10,
);
$form['email_password_reset']['user_mail_password_reset_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('password_reset_subject'),
'#maxlength' => 180,
@@ -507,7 +507,7 @@ function user_admin_settings() {
'#default_value' => variable_get('user_mail_status_activated_notify', TRUE),
);
$form['email_activated']['user_mail_status_activated_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('status_activated_subject'),
'#maxlength' => 180,
@@ -533,7 +533,7 @@ function user_admin_settings() {
'#default_value' => variable_get('user_mail_status_blocked_notify', FALSE),
);
$form['email_blocked']['user_mail_status_blocked_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('status_blocked_subject'),
'#maxlength' => 180,
@@ -554,7 +554,7 @@ function user_admin_settings() {
'#group' => 'email',
);
$form['email_cancel_confirm']['user_mail_cancel_confirm_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('cancel_confirm_subject'),
'#maxlength' => 180,
@@ -580,7 +580,7 @@ function user_admin_settings() {
'#default_value' => variable_get('user_mail_status_canceled_notify', FALSE),
);
$form['email_canceled']['user_mail_status_canceled_subject'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Subject'),
'#default_value' => _user_mail_text('status_canceled_subject'),
'#maxlength' => 180,
@@ -736,7 +736,7 @@ function user_admin_role() {
// Display the edit role form.
$role = db_query('SELECT * FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchObject();
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Role name'),
'#default_value' => $role->name,
'#size' => 30,
@@ -759,7 +759,7 @@ function user_admin_role() {
}
else {
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#size' => 32,
'#maxlength' => 64,
);
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1030
diff -u -p -r1.1030 user.module
--- modules/user/user.module 24 Aug 2009 00:14:23 -0000 1.1030
+++ modules/user/user.module 25 Aug 2009 14:41:47 -0000
@@ -1022,7 +1022,7 @@ function user_login_block() {
'#validate' => user_login_default_validators(),
'#submit' => array('user_login_submit'),
);
- $form['name'] = array('#type' => 'textfield',
+ $form['name'] = array('#type' => 'text',
'#title' => t('Username'),
'#maxlength' => USERNAME_MAX_LENGTH,
'#size' => 15,
@@ -1627,7 +1627,7 @@ function user_login(&$form_state) {
}
// Display login form:
- $form['name'] = array('#type' => 'textfield',
+ $form['name'] = array('#type' => 'text',
'#title' => t('Username'),
'#size' => 60,
'#maxlength' => USERNAME_MAX_LENGTH,
@@ -1898,7 +1898,7 @@ function user_edit_form(&$form_state, $u
);
// Only show name field when: registration page; or user is editing own account and can change username; or an admin user.
if ($register || ($GLOBALS['user']->uid == $uid && user_access('change own username')) || $admin) {
- $form['account']['name'] = array('#type' => 'textfield',
+ $form['account']['name'] = array('#type' => 'text',
'#title' => t('Username'),
'#default_value' => $edit['name'],
'#maxlength' => USERNAME_MAX_LENGTH,
@@ -1907,7 +1907,7 @@ function user_edit_form(&$form_state, $u
'#attributes' => array('class' => array('username')),
);
}
- $form['account']['mail'] = array('#type' => 'textfield',
+ $form['account']['mail'] = array('#type' => 'text',
'#title' => t('E-mail address'),
'#default_value' => $edit['mail'],
'#maxlength' => EMAIL_MAX_LENGTH,
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.49
diff -u -p -r1.49 user.pages.inc
--- modules/user/user.pages.inc 23 Aug 2009 04:50:25 -0000 1.49
+++ modules/user/user.pages.inc 25 Aug 2009 14:41:47 -0000
@@ -30,7 +30,7 @@ function user_autocomplete($string = '')
*/
function user_pass() {
$form['name'] = array(
- '#type' => 'textfield',
+ '#type' => 'text',
'#title' => t('Username or e-mail address'),
'#size' => 60,
'#maxlength' => max(USERNAME_MAX_LENGTH, EMAIL_MAX_LENGTH),