updated webform, webform_localization, profile2, term_merge, search_api_saved_pages, rules, redirect, overide_node_options

This commit is contained in:
2019-05-13 18:47:27 +02:00
parent 58cd990c8c
commit 9adc940a67
281 changed files with 28658 additions and 7138 deletions

View File

@@ -21,18 +21,12 @@ function token_requirements($phase = 'runtime') {
$problems = array_unique($problem['problems']);
$problems = array_map('check_plain', $problems);
$token_problems[$problem_key] = $problem['label'] . theme('item_list', array('items' => $problems));
$requirements['token-' . $problem_key] = array(
'title' => $problem['label'],
'value' => theme('item_list', array('items' => $problems)),
'severity' => $problem['severity'],
);
}
else {
unset($token_problems[$problem_key]);
}
}
if (!empty($token_problems)) {
$requirements['token_problems'] = array(
'title' => $t('Tokens'),
'value' => $t('Problems detected'),
'severity' => REQUIREMENT_WARNING,
'description' => '<p>' . implode('</p><p>', $token_problems) . '</p>', //theme('item_list', array('items' => $token_problems)),
);
}
}
@@ -272,19 +266,24 @@ function token_get_token_problems() {
$token_info = token_info();
$token_problems = array(
'not-array' => array(
'label' => t('The following tokens or token types are not defined as arrays:'),
'label' => t('Tokens or token types not defined as arrays'),
'severity' => REQUIREMENT_ERROR,
),
'missing-info' => array(
'label' => t('The following tokens or token types are missing required name and/or description information:'),
'label' => t('Tokens or token types missing name property'),
'severity' => REQUIREMENT_WARNING,
),
'type-no-tokens' => array(
'label' => t('The following token types do not have any tokens defined:'),
'label' => t('Token types do not have any tokens defined'),
'severity' => REQUIREMENT_INFO,
),
'tokens-no-type' => array(
'label' => t('The following token types are not defined but have tokens:'),
'label' => t('Token types are not defined but have tokens'),
'severity' => REQUIREMENT_INFO,
),
'duplicate' => array(
'label' => t('The following token or token types are defined by multiple modules:')
'label' => t('Token or token types are defined by multiple modules'),
'severity' => REQUIREMENT_ERROR,
),
);
@@ -295,9 +294,12 @@ function token_get_token_problems() {
$token_problems['not-array']['problems'][] = "\$info['types']['$type']";
continue;
}
elseif (!isset($type_info['name']) || !isset($type_info['description'])) {
elseif (!isset($type_info['name'])) {
$token_problems['missing-info']['problems'][] = "\$info['types']['$type']";
}
elseif (is_array($type_info['name'])) {
$token_problems['duplicate']['problems'][] = "\$info['types']['$type']";
}
elseif (empty($token_info['tokens'][$real_type])) {
$token_problems['type-no-tokens']['problems'][] = "\$info['tokens']['$real_type']";
}
@@ -315,10 +317,10 @@ function token_get_token_problems() {
$token_problems['not-array']['problems'][] = "\$info['tokens']['$type']['$token']";
continue;
}
elseif (!isset($tokens[$token]['name']) || !isset($tokens[$token]['description'])) {
elseif (!isset($tokens[$token]['name'])) {
$token_problems['missing-info']['problems'][] = "\$info['tokens']['$type']['$token']";
}
elseif (is_array($tokens[$token]['name']) || is_array($tokens[$token]['description'])) {
elseif (is_array($tokens[$token]['name'])) {
$token_problems['duplicate']['problems'][] = "\$info['tokens']['$type']['$token']";
}
}