diff --git a/core/includes/common.inc b/core/includes/common.inc index 9dba0daea932752650f1466a5b76a773bc0fcb4e..8a8ea0e85bb540e0a421332f5d96efeae489be8b 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -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 // them. if (isset($elements['#type']) && empty($elements['#defaults_loaded'])) { diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc index 1fd7b5f30b6e7a684aa3ed5a901bda1c13eb0c64..f6c4076c10d62cb451a2836a681f3390db1bdf40 100644 --- a/core/modules/block/custom_block/custom_block.pages.inc +++ b/core/modules/block/custom_block/custom_block.pages.inc @@ -66,7 +66,6 @@ function custom_block_delete_form($form, &$form_state, CustomBlock $block) { $instances = $block->getInstances(); $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.'), '#access' => !empty($instances), ); diff --git a/core/modules/file/file.module b/core/modules/file/file.module index f7a7c8660e19f5781ebaeb62f4432631bc4169b4..4a45b5193246698b1b15d9e75cd35dee211f4a1f 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -965,7 +965,6 @@ function file_managed_file_process($element, &$form_state, $form) { } else { $element['file_' . $delta]['filename'] = array( - '#type' => 'markup', '#markup' => theme('file_link', array('file' => $file)) . ' ', '#weight' => -10, ); diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc index ab64ffe816f1278c6794373919ebc707ee1ce223..07299797e2e82d2322732d1ea590adf08626c66d 100644 --- a/core/modules/image/image.field.inc +++ b/core/modules/image/image.field.inc @@ -346,7 +346,6 @@ function image_field_widget_process($element, &$form_state, $form) { } $element['preview'] = array( - '#type' => 'markup', '#markup' => theme('image_style', $variables), ); diff --git a/core/modules/layout/layout.admin.inc b/core/modules/layout/layout.admin.inc index fac43708ec5f948f117b6fb3bfc1871df11e075d..53ac47b527cbbc58f6bcbdc011db213b49e5152d 100644 --- a/core/modules/layout/layout.admin.inc +++ b/core/modules/layout/layout.admin.inc @@ -27,7 +27,6 @@ function layout_page_view($key) { $regions[$region] = '
' . t('Updates of Drupal core are not supported at this time.') . '
'; $form['manual_updates'] = array( - '#type' => 'markup', '#markup' => theme('table', array('header' => $headers, 'rows' => $projects['manual'])), '#prefix' => $prefix, '#weight' => 120, diff --git a/core/modules/views/views.module b/core/modules/views/views.module index c7077e93c0ded409729c6360da5e2ce1fcd76c54..279f795edc59c6a3d6f3fc25c3ac47a4ce2580fb 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -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 // array is passed to the theme function. $form['output'] = array( - '#type' => 'markup', '#markup' => $output, // This way any additional form elements will go before the view // (below the exposed widgets).