summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiraly Peter2013-07-13 13:37:53 (GMT)
committer Kiraly Peter2013-07-13 13:37:53 (GMT)
commit393f56e750f101de9c7ab96e14dfca8c916713c4 (patch)
treeba16e81c5284980f42b85e2eaaa194b84d7fb2ef
parentfcd404cb7de3fade3c186904b663f12fb5b349df (diff)
Change item type form element key from #value to #markup
-rw-r--r--ezproxy_url_rewrite/ezproxy_url_rewrite.module4
-rw-r--r--oaiharvester/oaiharvester.module4
-rw-r--r--xc/xc.module4
-rw-r--r--xc_account/xc_account.module6
-rw-r--r--xc_auth/xc_auth.module28
-rw-r--r--xc_index/xc_index.superlocation.inc2
-rw-r--r--xc_metadata/includes/xc_metadata.delete.inc2
-rw-r--r--xc_ncip_provider/xc_ncip_provider.module4
-rw-r--r--xc_search/admin/xc_search.holdings_location.inc2
-rw-r--r--xc_sql/xc_sql.module4
-rw-r--r--xc_wordnet/xc_wordnet.module2
11 files changed, 31 insertions, 31 deletions
diff --git a/ezproxy_url_rewrite/ezproxy_url_rewrite.module b/ezproxy_url_rewrite/ezproxy_url_rewrite.module
index 64a8e49..68f6651 100644
--- a/ezproxy_url_rewrite/ezproxy_url_rewrite.module
+++ b/ezproxy_url_rewrite/ezproxy_url_rewrite.module
@@ -119,7 +119,7 @@ function ezproxy_url_rewrite_settings($form, &$form_state) {
$form['instructions']['text'] = array(
'#type' => 'item',
- '#value' => t(<<<EOF
+ '#markup' => t(<<<EOF
EZProxy URL rewriting supports three type of additions to the URL string:
prefix, infix, and suffix, respectively adding text to the beginning,
middle (immediately after the hostname), or end of a URL string.
@@ -328,7 +328,7 @@ function ezproxy_url_rewrite_ip_form($form, &$form_state) {
$form['instructions']['text'] = array(
'#type' => 'item',
- '#value' => t(<<<EOF
+ '#markup' => t(<<<EOF
Use the fields below to create a range of IP addresses to exclude from EZProxy
URL rewriting. You may enter a positive integer, a range of positive integers,
the word ALL, or an asterisk (*). The following examples are all valid:
diff --git a/oaiharvester/oaiharvester.module b/oaiharvester/oaiharvester.module
index db58e4a..70ee2a6 100644
--- a/oaiharvester/oaiharvester.module
+++ b/oaiharvester/oaiharvester.module
@@ -1953,7 +1953,7 @@ function oaiharvester_schedule_clear_cache_form($form, &$form_state, $schedule)
$form['question'] = array(
'#type' => 'item',
- '#value' => $question,
+ '#markup' => $question,
);
return confirm_form($form,
@@ -1989,7 +1989,7 @@ function oaiharvester_schedule_set_passive_form($form, &$form_state, $schedule)
$form['question'] = array(
'#type' => 'item',
- '#value' => $question,
+ '#markup' => $question,
);
$processing_cron = variable_get('oaiharvester_processing_cron', 'NOT_RUNNING');
diff --git a/xc/xc.module b/xc/xc.module
index acd91e4..ab18386 100644
--- a/xc/xc.module
+++ b/xc/xc.module
@@ -762,7 +762,7 @@ function xc_turn_on_alerts_form($form, &$form_state) {
if ($alerted) {
$form['message'] = array(
'#type' => 'item',
- '#value' => t('If the site admin is alerted once, the site will not report the problem again. After he solve the problem, he have to turn this feature on, to activate email sending.'),
+ '#markup' => t('If the site admin is alerted once, the site will not report the problem again. After he solve the problem, he have to turn this feature on, to activate email sending.'),
);
return confirm_form($form, t('Do you want to turn on alerts?'), '', '', t('Activate alerting email again'), t('Cancel'));
@@ -770,7 +770,7 @@ function xc_turn_on_alerts_form($form, &$form_state) {
else {
$form['message'] = array(
'#type' => 'item',
- '#value' => t('The site admin has not been alerted recently, so no action needed this time.'),
+ '#markup' => t('The site admin has not been alerted recently, so no action needed this time.'),
);
return $form;
diff --git a/xc_account/xc_account.module b/xc_account/xc_account.module
index 9186b3e..231d74f 100644
--- a/xc_account/xc_account.module
+++ b/xc_account/xc_account.module
@@ -738,17 +738,17 @@ function xc_account_bookmarked_items_form($form, $form_state, $account) {
),
'title' => array(
'#type' => 'item',
- '#value' => $title,
+ '#markup' => $title,
'#name' => 'title'
),
'authors' => array(
'#type' => 'item',
- '#value' => $authors,
+ '#markup' => $authors,
'#name' => 'authors'
),
'formats' => array(
'#type' => 'item',
- '#value' => $formats,
+ '#markup' => $formats,
'#name' => 'formats'
),
);
diff --git a/xc_auth/xc_auth.module b/xc_auth/xc_auth.module
index 06aedb7..e0407df 100644
--- a/xc_auth/xc_auth.module
+++ b/xc_auth/xc_auth.module
@@ -613,7 +613,7 @@ function xc_auth_type_form($form, &$form_state, $auth_type = NULL) {
else {
$form['credentials']['info'] = array(
'#type' => 'item',
- '#value' => t('No login form credentials to edit'),
+ '#markup' => t('No login form credentials to edit'),
);
}
@@ -2050,7 +2050,7 @@ function xc_auth_user_XXX($edit, $account) {
);
$form['auth_types']['tid_' . $auth_type->tid]['info'] = array(
'#type' => 'item',
- '#value' => t('Currently authorized to log in as <strong>!identity</strong>. Deauthorizing prevent logging into this account and could also destroy all account settings!',
+ '#markup' => t('Currently authorized to log in as <strong>!identity</strong>. Deauthorizing prevent logging into this account and could also destroy all account settings!',
array('!identity' => $auth_user->identity)),
);
$form_key = 'deauthorize_' . $auth_type->tid . '_' . $account->uid;
@@ -2346,7 +2346,7 @@ function xc_auth_login_form($form, &$form_state, $auth_type = NULL, $type = 'log
if ($type == 'login' && isset($_SESSION['xc_auth_types'][$auth_type->tid]['identity'])) {
$form['info'] = array(
'#type' => 'item',
- '#value' => t('Currently logged into %name as <strong>!identity</strong>',
+ '#markup' => t('Currently logged into %name as <strong>!identity</strong>',
array(
'%name' => $auth_type->name,
'!identity' => $_SESSION['xc_auth_types'][$auth_type->tid]['identity'],
@@ -2396,12 +2396,12 @@ function xc_auth_login_form($form, &$form_state, $auth_type = NULL, $type = 'log
$form[$element . '-info'] = array(
'#type' => 'item',
- '#description' => t('%name has been automatically remembered as <strong>!username</strong>',
+ '#markup' => t('%name has been automatically remembered as <strong>!username</strong>',
array(
- '%name' => $_label, // the label of use = NetID or Username or Barcode
- '!username' => $_SESSION['xc_auth_types'][$auth_type->tid]['values'][$element],
- )
- ),
+ '%name' => $_label, // the label of use = NetID or Username or Barcode
+ '!username' => $_SESSION['xc_auth_types'][$auth_type->tid]['values'][$element],
+ )
+ ),
);
}
else {
@@ -2419,13 +2419,13 @@ function xc_auth_login_form($form, &$form_state, $auth_type = NULL, $type = 'log
$form['reset_password_text'] = array(
'#type' => 'item',
- '#value' => isset($auth_type->reset_password_text) ? $auth_type->reset_password_text : '',
+ '#markup' => isset($auth_type->reset_password_text) ? $auth_type->reset_password_text : '',
'#weight' => 99,
);
$form['help_text'] = array(
'#type' => 'item',
- '#value' => isset($auth_type->help_text) ? $auth_type->help_text : '',
+ '#markup' => isset($auth_type->help_text) ? $auth_type->help_text : '',
'#weight' => 100,
);
@@ -2619,7 +2619,7 @@ function xc_auth_auto_login_form($form, &$form_state, $data = array()) {
if (isset($_SESSION['xc_auth_types'][$auth_type->tid]['identity'])) {
$form['info'] = array(
'#type' => 'item',
- '#value' => t('Currently logged into %name as <strong>!identity</strong>',
+ '#markup' => t('Currently logged into %name as <strong>!identity</strong>',
array(
'%name' => $auth_type->name,
'!identity' => $_SESSION['xc_auth_types'][$auth_type->tid]['identity'],
@@ -2683,13 +2683,13 @@ function xc_auth_auto_login_form($form, &$form_state, $data = array()) {
$form['reset_password_text'] = array(
'#type' => 'item',
- '#value' => $data['reset_password_text'],
+ '#markup' => $data['reset_password_text'],
'#weight' => 99,
);
$form['help_text'] = array(
'#type' => 'item',
- '#value' => $data['help_text'],
+ '#markup' => $data['help_text'],
'#weight' => 100,
);
@@ -3154,7 +3154,7 @@ function xc_auth_login_block_form($form, &$form_state, $login_block = NULL) {
else {
$form['data']['form']['info'] = array(
'#type' => 'item',
- '#value' => t('No login form credentials to edit'),
+ '#markup' => t('No login form credentials to edit'),
);
}
diff --git a/xc_index/xc_index.superlocation.inc b/xc_index/xc_index.superlocation.inc
index bc6ee2b..170ac93 100644
--- a/xc_index/xc_index.superlocation.inc
+++ b/xc_index/xc_index.superlocation.inc
@@ -18,7 +18,7 @@ function xc_index_superlocation_form($form, &$form_state) {
$form['description'] = array(
'#type' => 'item',
- '#value' => t('Upload a CSV (Comma Separated Values) file containing the location data. Each record contains a code and a label.'),
+ '#markup' => t('Upload a CSV (Comma Separated Values) file containing the location data. Each record contains a code and a label.'),
);
$form['upload'] = array(
diff --git a/xc_metadata/includes/xc_metadata.delete.inc b/xc_metadata/includes/xc_metadata.delete.inc
index ea9baf5..dac6d23 100644
--- a/xc_metadata/includes/xc_metadata.delete.inc
+++ b/xc_metadata/includes/xc_metadata.delete.inc
@@ -20,7 +20,7 @@ function xc_metadata_delete_form($form, &$form_state) {
$form['instructions']['how'] = array(
'#type' => 'item',
'#title' => t('How it works'),
- '#value' => t('This batch process <strong>completely deletes and removes</strong> all entity and node from Drupal based on the selected criteria.'),
+ '#markup' => t('This batch process <strong>completely deletes and removes</strong> all entity and node from Drupal based on the selected criteria.'),
);
$form['types'] = array(
diff --git a/xc_ncip_provider/xc_ncip_provider.module b/xc_ncip_provider/xc_ncip_provider.module
index 15ba075..d1c96ba 100644
--- a/xc_ncip_provider/xc_ncip_provider.module
+++ b/xc_ncip_provider/xc_ncip_provider.module
@@ -445,7 +445,7 @@ function _xc_ncip_provider_test_form($ncip_provider) {
$form['name'] = array(
'#type' => 'item',
'#title' => t('NCIP Server'),
- '#value' => $ncip_provider->name,
+ '#markup' => $ncip_provider->name,
);
if ($ncip_provider->properties['is_ncip_toolkit']) {
@@ -464,7 +464,7 @@ function _xc_ncip_provider_test_form($ncip_provider) {
$form['ncip_toolkit'] = array(
'#type' => 'item',
'#title' => t('NCIP Toolkit Test Interface'),
- '#value' => l($url, $url),
+ '#markup' => l($url, $url),
);
}
diff --git a/xc_search/admin/xc_search.holdings_location.inc b/xc_search/admin/xc_search.holdings_location.inc
index 927f93f..ceece68 100644
--- a/xc_search/admin/xc_search.holdings_location.inc
+++ b/xc_search/admin/xc_search.holdings_location.inc
@@ -19,7 +19,7 @@ function xc_search_holdings_location_form($form, &$form_state) {
$form['description'] = array(
'#type' => 'item',
- '#value' => t('Upload a CSV (Comma Separated Values) file containing the location data. Each record contains a code and a label. The first line of the file should contain the name of fields (code and label).'),
+ '#markup' => t('Upload a CSV (Comma Separated Values) file containing the location data. Each record contains a code and a label. The first line of the file should contain the name of fields (code and label).'),
);
$form['upload'] = array(
diff --git a/xc_sql/xc_sql.module b/xc_sql/xc_sql.module
index 10ff652..007d5b3 100644
--- a/xc_sql/xc_sql.module
+++ b/xc_sql/xc_sql.module
@@ -128,7 +128,7 @@ function xc_sql_xc_location($op, $location, $params = array()) {
$form['sql']['xc_sql_notice'] = array(
'#type' => 'item',
'#title' => t('Notice'),
- '#value' => t('No additional information is necessary to store metadata into the Drupal SQL database'),
+ '#markup' => t('No additional information is necessary to store metadata into the Drupal SQL database'),
);
return $form;
}
@@ -185,7 +185,7 @@ function xc_sql_form_alter(&$form, &$form_state, $form_id) {
$form['sql']['sql_notice'] = array(
'#type' => 'item',
'#title' => t('Notice'),
- '#value' => t('No additional information is necessary to store metadata into the Drupal SQL database'),
+ '#markup' => t('No additional information is necessary to store metadata into the Drupal SQL database'),
);
$form['#validate'][] = 'xc_sql_location_validate';
diff --git a/xc_wordnet/xc_wordnet.module b/xc_wordnet/xc_wordnet.module
index 9777402..0747804 100644
--- a/xc_wordnet/xc_wordnet.module
+++ b/xc_wordnet/xc_wordnet.module
@@ -176,7 +176,7 @@ function xc_wordnet_admin_settings($form, &$form_state) {
$form['description'] = array(
'#type' => 'item',
- '#value' => '<p>'
+ '#markup' => '<p>'
. t('Set the attributes of the special Apache Solr index specific for the WordNet. Do not confuse this Solr index with the main bibliographic index.')
. '</p>'
. '<p>'