summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-06-24 09:46:21 (GMT)
committerAlex Pott2013-06-24 09:46:21 (GMT)
commit9873c74069e673d92555602c7c2ec42bf2846e6b (patch)
tree857501092284601de3ee84f38fa57fd9f13aa35d
parent431dc2e3f1371611fc243ef30df26802806670fc (diff)
Issue #2012818 by thedavidmeister: Remove #type 'markup'.
-rw-r--r--core/includes/common.inc6
-rw-r--r--core/modules/block/custom_block/custom_block.pages.inc1
-rw-r--r--core/modules/file/file.module1
-rw-r--r--core/modules/image/image.field.inc1
-rw-r--r--core/modules/layout/layout.admin.inc1
-rw-r--r--core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php1
-rw-r--r--core/modules/system/system.module3
-rw-r--r--core/modules/system/tests/modules/plugin_test/plugin_test.module1
-rw-r--r--core/modules/update/update.manager.inc1
-rw-r--r--core/modules/views/views.module1
10 files changed, 0 insertions, 17 deletions
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 9dba0da..8a8ea0e 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 1fd7b5f..f6c4076 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 f7a7c86..4a45b51 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 ab64ffe..0729979 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 fac4370..53ac47b 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] = '<div class="layout-region-demonstration">' . check_plain($info['label']) . '</div>';
}
$build['demonstration'] = array(
- '#type' => 'markup',
'#markup' => $instance->renderLayout(TRUE, $regions),
);
$build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css';
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
index b75896a..27daeef 100644
--- a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
+++ b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
@@ -167,7 +167,6 @@ class LinkFormatter extends FormatterBase {
if (!empty($settings['url_only']) && !empty($settings['url_plain'])) {
$element[$delta] = array(
- '#type' => 'markup',
'#markup' => check_plain($link_title),
);
}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 125f807..7a1b8d4 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -541,9 +541,6 @@ function system_element_info() {
$types['value'] = array(
'#input' => TRUE,
);
- $types['markup'] = array(
- '#markup' => '',
- );
$types['link'] = array(
'#pre_render' => array('drupal_pre_render_link'),
);
diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.module b/core/modules/system/tests/modules/plugin_test/plugin_test.module
index 45f89cf..27fc614 100644
--- a/core/modules/system/tests/modules/plugin_test/plugin_test.module
+++ b/core/modules/system/tests/modules/plugin_test/plugin_test.module
@@ -40,7 +40,6 @@ function plugin_test_definitions() {
$output = array();
foreach($manager->getDefinitions() as $plugin_id => $definition) {
$output[$plugin_id] = array(
- '#type' => 'markup',
'#markup' => $definition['label'],
);
}
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index 8e2bce9..6b6767b 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -258,7 +258,6 @@ function update_manager_update_form($form, $form_state = array(), $context) {
$prefix = '<h2>' . t('Manual updates required') . '</h2>';
$prefix .= '<p>' . t('Updates of Drupal core are not supported at this time.') . '</p>';
$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 c7077e9..279f795 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).