Commit 9873c740 authored by alexpott's avatar alexpott

Issue #2012818 by thedavidmeister: Remove #type 'markup'.

parent 431dc2e3
...@@ -4651,12 +4651,6 @@ function drupal_render(&$elements) { ...@@ -4651,12 +4651,6 @@ function drupal_render(&$elements) {
} }
} }
// If #markup is set, ensure #type is set. This allows to specify just #markup
// on an element without setting #type.
if (isset($elements['#markup']) && !isset($elements['#type'])) {
$elements['#type'] = 'markup';
}
// If the default values for this element have not been loaded yet, populate // If the default values for this element have not been loaded yet, populate
// them. // them.
if (isset($elements['#type']) && empty($elements['#defaults_loaded'])) { if (isset($elements['#type']) && empty($elements['#defaults_loaded'])) {
......
...@@ -66,7 +66,6 @@ function custom_block_delete_form($form, &$form_state, CustomBlock $block) { ...@@ -66,7 +66,6 @@ function custom_block_delete_form($form, &$form_state, CustomBlock $block) {
$instances = $block->getInstances(); $instances = $block->getInstances();
$form['message'] = array( $form['message'] = array(
'#type' => 'markup',
'#markup' => format_plural(count($instances), 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instances.'), '#markup' => format_plural(count($instances), 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instances.'),
'#access' => !empty($instances), '#access' => !empty($instances),
); );
......
...@@ -965,7 +965,6 @@ function file_managed_file_process($element, &$form_state, $form) { ...@@ -965,7 +965,6 @@ function file_managed_file_process($element, &$form_state, $form) {
} }
else { else {
$element['file_' . $delta]['filename'] = array( $element['file_' . $delta]['filename'] = array(
'#type' => 'markup',
'#markup' => theme('file_link', array('file' => $file)) . ' ', '#markup' => theme('file_link', array('file' => $file)) . ' ',
'#weight' => -10, '#weight' => -10,
); );
......
...@@ -346,7 +346,6 @@ function image_field_widget_process($element, &$form_state, $form) { ...@@ -346,7 +346,6 @@ function image_field_widget_process($element, &$form_state, $form) {
} }
$element['preview'] = array( $element['preview'] = array(
'#type' => 'markup',
'#markup' => theme('image_style', $variables), '#markup' => theme('image_style', $variables),
); );
......
...@@ -27,7 +27,6 @@ function layout_page_view($key) { ...@@ -27,7 +27,6 @@ function layout_page_view($key) {
$regions[$region] = '<div class="layout-region-demonstration">' . check_plain($info['label']) . '</div>'; $regions[$region] = '<div class="layout-region-demonstration">' . check_plain($info['label']) . '</div>';
} }
$build['demonstration'] = array( $build['demonstration'] = array(
'#type' => 'markup',
'#markup' => $instance->renderLayout(TRUE, $regions), '#markup' => $instance->renderLayout(TRUE, $regions),
); );
$build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css'; $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css';
......
...@@ -167,7 +167,6 @@ public function viewElements(EntityInterface $entity, $langcode, array $items) { ...@@ -167,7 +167,6 @@ public function viewElements(EntityInterface $entity, $langcode, array $items) {
if (!empty($settings['url_only']) && !empty($settings['url_plain'])) { if (!empty($settings['url_only']) && !empty($settings['url_plain'])) {
$element[$delta] = array( $element[$delta] = array(
'#type' => 'markup',
'#markup' => check_plain($link_title), '#markup' => check_plain($link_title),
); );
} }
......
...@@ -541,9 +541,6 @@ function system_element_info() { ...@@ -541,9 +541,6 @@ function system_element_info() {
$types['value'] = array( $types['value'] = array(
'#input' => TRUE, '#input' => TRUE,
); );
$types['markup'] = array(
'#markup' => '',
);
$types['link'] = array( $types['link'] = array(
'#pre_render' => array('drupal_pre_render_link'), '#pre_render' => array('drupal_pre_render_link'),
); );
......
...@@ -40,7 +40,6 @@ function plugin_test_definitions() { ...@@ -40,7 +40,6 @@ function plugin_test_definitions() {
$output = array(); $output = array();
foreach($manager->getDefinitions() as $plugin_id => $definition) { foreach($manager->getDefinitions() as $plugin_id => $definition) {
$output[$plugin_id] = array( $output[$plugin_id] = array(
'#type' => 'markup',
'#markup' => $definition['label'], '#markup' => $definition['label'],
); );
} }
......
...@@ -258,7 +258,6 @@ function update_manager_update_form($form, $form_state = array(), $context) { ...@@ -258,7 +258,6 @@ function update_manager_update_form($form, $form_state = array(), $context) {
$prefix = '<h2>' . t('Manual updates required') . '</h2>'; $prefix = '<h2>' . t('Manual updates required') . '</h2>';
$prefix .= '<p>' . t('Updates of Drupal core are not supported at this time.') . '</p>'; $prefix .= '<p>' . t('Updates of Drupal core are not supported at this time.') . '</p>';
$form['manual_updates'] = array( $form['manual_updates'] = array(
'#type' => 'markup',
'#markup' => theme('table', array('header' => $headers, 'rows' => $projects['manual'])), '#markup' => theme('table', array('header' => $headers, 'rows' => $projects['manual'])),
'#prefix' => $prefix, '#prefix' => $prefix,
'#weight' => 120, '#weight' => 120,
......
...@@ -1171,7 +1171,6 @@ function views_form_views_form($form, &$form_state, ViewExecutable $view, $outpu ...@@ -1171,7 +1171,6 @@ function views_form_views_form($form, &$form_state, ViewExecutable $view, $outpu
// Add the output markup to the form array so that it's included when the form // Add the output markup to the form array so that it's included when the form
// array is passed to the theme function. // array is passed to the theme function.
$form['output'] = array( $form['output'] = array(
'#type' => 'markup',
'#markup' => $output, '#markup' => $output,
// This way any additional form elements will go before the view // This way any additional form elements will go before the view
// (below the exposed widgets). // (below the exposed widgets).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment