+
{%- if description -%}
-
{{ description }}
+
{{ description }}
{%- endif -%}
{%- if children -%}
{{ children }}
diff --git a/core/modules/system/templates/progress-bar.html.twig b/core/modules/system/templates/progress-bar.html.twig
index 885a80f..be87024 100644
--- a/core/modules/system/templates/progress-bar.html.twig
+++ b/core/modules/system/templates/progress-bar.html.twig
@@ -19,5 +19,5 @@
{% endif %}
{{ percent }}%
-
{{ message }}
+
{{ message|raw }}
diff --git a/core/modules/system/tests/modules/common_test/templates/common-test-render-element.html.twig b/core/modules/system/tests/modules/common_test/templates/common-test-render-element.html.twig
deleted file mode 100644
index ae00c8e..0000000
--- a/core/modules/system/tests/modules/common_test/templates/common-test-render-element.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for the common test render element.
- *
- * Available variables:
- * - foo: A render array.
- *
- * @ingroup themeable
- */
-#}
-{{ foo }}
diff --git a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
index ff49bd6..2bf5394 100644
--- a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
+++ b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
@@ -50,16 +50,6 @@ public function linkGeneratorRender() {
}
/**
- * Renders a URL to a string.
- */
- public function urlToStringRender() {
- return [
- '#theme' => 'twig_theme_test_url_to_string',
- '#test_url' => Url::fromRoute('user.register'),
- ];
- }
-
- /**
* Renders for testing file_url functions in a Twig template.
*/
public function fileUrlRender() {
diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_to_string.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_to_string.html.twig
deleted file mode 100644
index e337a6f..0000000
--- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_to_string.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-
rendered url: {{ test_url }}
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index 7f6fe35..e42b020 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -42,10 +42,6 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
'variables' => array('test_url' => NULL),
'template' => 'twig_theme_test.link_generator',
);
- $items['twig_theme_test_url_to_string'] = array(
- 'variables' => array('test_url' => NULL),
- 'template' => 'twig_theme_test.url_to_string',
- );
$items['twig_theme_test_file_url'] = array(
'variables' => array(),
'template' => 'twig_theme_test.file_url',
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
index 1001b47..4d30bb9 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
@@ -26,13 +26,6 @@ twig_theme_test_link_generator:
requirements:
_access: 'TRUE'
-twig_theme_test_url_to_string:
- path: '/twig-theme-test/url-to-string'
- defaults:
- _controller: '\Drupal\twig_theme_test\TwigThemeTestController::urlToStringRender'
- requirements:
- _access: 'TRUE'
-
twig_theme_test_file_url:
path: '/twig-theme-test/file-url'
defaults:
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
index 11a2f63..c2720ec 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
@@ -7,16 +7,16 @@
namespace Drupal\taxonomy\Tests;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
-use Drupal\taxonomy\Tests\TaxonomyTestTrait;
+use Drupal\taxonomy\Entity\Vocabulary;
/**
* Provides common helper methods for Taxonomy module tests.
*/
abstract class TaxonomyTestBase extends WebTestBase {
- use TaxonomyTestTrait;
-
/**
* Modules to enable.
*
@@ -36,4 +36,49 @@ protected function setUp() {
$this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
}
}
+
+ /**
+ * Returns a new vocabulary with random properties.
+ */
+ function createVocabulary() {
+ // Create a vocabulary.
+ $vocabulary = entity_create('taxonomy_vocabulary', array(
+ 'name' => $this->randomMachineName(),
+ 'description' => $this->randomMachineName(),
+ 'vid' => Unicode::strtolower($this->randomMachineName()),
+ 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ 'weight' => mt_rand(0, 10),
+ ));
+ $vocabulary->save();
+ return $vocabulary;
+ }
+
+ /**
+ * Returns a new term with random properties in vocabulary $vid.
+ *
+ * @param \Drupal\taxonomy\Entity\Vocabulary $vocabulary
+ * The vocabulary object.
+ * @param array $values
+ * (optional) An array of values to set, keyed by property name. If the
+ * entity type has bundles, the bundle key has to be specified.
+ *
+ * @return \Drupal\taxonomy\Entity\Term
+ * The new taxonomy term object.
+ */
+ function createTerm(Vocabulary $vocabulary, $values = array()) {
+ $filter_formats = filter_formats();
+ $format = array_pop($filter_formats);
+ $term = entity_create('taxonomy_term', $values + array(
+ 'name' => $this->randomMachineName(),
+ 'description' => array(
+ 'value' => $this->randomMachineName(),
+ // Use the first available text format.
+ 'format' => $format->id(),
+ ),
+ 'vid' => $vocabulary->id(),
+ 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+ ));
+ $term->save();
+ return $term;
+ }
}
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
deleted file mode 100644
index 34971db..0000000
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ /dev/null
@@ -1,63 +0,0 @@
- $this->randomMachineName(),
- 'description' => $this->randomMachineName(),
- 'vid' => Unicode::strtolower($this->randomMachineName()),
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- 'weight' => mt_rand(0, 10),
- ));
- $vocabulary->save();
- return $vocabulary;
- }
-
- /**
- * Returns a new term with random properties in vocabulary $vid.
- *
- * @param \Drupal\taxonomy\Entity\Vocabulary $vocabulary
- * The vocabulary object.
- * @param array $values
- * (optional) An array of values to set, keyed by property name. If the
- * entity type has bundles, the bundle key has to be specified.
- *
- * @return \Drupal\taxonomy\Entity\Term
- * The new taxonomy term object.
- */
- function createTerm(Vocabulary $vocabulary, $values = array()) {
- $filter_formats = filter_formats();
- $format = array_pop($filter_formats);
- $term = entity_create('taxonomy_term', $values + array(
- 'name' => $this->randomMachineName(),
- 'description' => array(
- 'value' => $this->randomMachineName(),
- // Use the first available text format.
- 'format' => $format->id(),
- ),
- 'vid' => $vocabulary->id(),
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- ));
- $term->save();
- return $term;
- }
-}
diff --git a/core/modules/taxonomy/src/Tests/TermKernelTest.php b/core/modules/taxonomy/src/Tests/TermKernelTest.php
deleted file mode 100644
index 6692775..0000000
--- a/core/modules/taxonomy/src/Tests/TermKernelTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-installConfig(array('filter'));
- $this->installEntitySchema('taxonomy_term');
- }
-
- /**
- * Deleting terms should also remove related vocabulary.
- * Deleting an invalid term should silently fail.
- */
- public function testTermDelete() {
- $vocabulary = $this->createVocabulary();
- $valid_term = $this->createTerm($vocabulary);
- // Delete a valid term.
- $valid_term->delete();
- $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
- $this->assertTrue(empty($terms), 'Vocabulary is empty after deletion');
-
- // Delete an invalid term. Should not throw any notices.
- entity_delete_multiple('taxonomy_term', array(42));
- }
-
- /**
- * Deleting a parent of a term with multiple parents does not delete the term.
- */
- public function testMultipleParentDelete() {
- $vocabulary = $this->createVocabulary();
- $parent_term1 = $this->createTerm($vocabulary);
- $parent_term2 = $this->createTerm($vocabulary);
- $child_term = $this->createTerm($vocabulary);
- $child_term->parent = array($parent_term1->id(), $parent_term2->id());
- $child_term->save();
- $child_term_id = $child_term->id();
-
- $parent_term1->delete();
- $term_storage = $this->container->get('entity.manager')->getStorage('taxonomy_term');
- $term_storage->resetCache(array($child_term_id));
- $child_term = Term::load($child_term_id);
- $this->assertTrue(!empty($child_term), 'Child term is not deleted if only one of its parents is removed.');
-
- $parent_term2->delete();
- $term_storage->resetCache(array($child_term_id));
- $child_term = Term::load($child_term_id);
- $this->assertTrue(empty($child_term), 'Child term is deleted if all of its parents are removed.');
- }
-
- /**
- * Test a taxonomy with terms that have multiple parents of different depths.
- */
- public function testTaxonomyVocabularyTree() {
- // Create a new vocabulary with 6 terms.
- $vocabulary = $this->createVocabulary();
- $term = array();
- for ($i = 0; $i < 6; $i++) {
- $term[$i] = $this->createTerm($vocabulary);
- }
-
- // Set the weight on $term[1] so it appears before $term[5] when fetching
- // the parents for $term[2], in order to test for a regression on
- // \Drupal\taxonomy\TermStorageInterface::loadAllParents().
- $term[1]->weight = -1;
- $term[1]->save();
-
- // $term[2] is a child of 1 and 5.
- $term[2]->parent = array($term[1]->id(), $term[5]->id());
- $term[2]->save();
- // $term[3] is a child of 2.
- $term[3]->parent = array($term[2]->id());
- $term[3]->save();
- // $term[5] is a child of 4.
- $term[5]->parent = array($term[4]->id());
- $term[5]->save();
-
- /**
- * Expected tree:
- * term[0] | depth: 0
- * term[1] | depth: 0
- * -- term[2] | depth: 1
- * ---- term[3] | depth: 2
- * term[4] | depth: 0
- * -- term[5] | depth: 1
- * ---- term[2] | depth: 2
- * ------ term[3] | depth: 3
- */
- // Count $term[1] parents with $max_depth = 1.
- $tree = taxonomy_get_tree($vocabulary->id(), $term[1]->id(), 1);
- $this->assertEqual(1, count($tree), 'We have one parent with depth 1.');
-
- // Count all vocabulary tree elements.
- $tree = taxonomy_get_tree($vocabulary->id());
- $this->assertEqual(8, count($tree), 'We have all vocabulary tree elements.');
-
- // Count elements in every tree depth.
- foreach ($tree as $element) {
- if (!isset($depth_count[$element->depth])) {
- $depth_count[$element->depth] = 0;
- }
- $depth_count[$element->depth]++;
- }
- $this->assertEqual(3, $depth_count[0], 'Three elements in taxonomy tree depth 0.');
- $this->assertEqual(2, $depth_count[1], 'Two elements in taxonomy tree depth 1.');
- $this->assertEqual(2, $depth_count[2], 'Two elements in taxonomy tree depth 2.');
- $this->assertEqual(1, $depth_count[3], 'One element in taxonomy tree depth 3.');
-
- /** @var \Drupal\taxonomy\TermStorageInterface $storage */
- $storage = \Drupal::entityManager()->getStorage('taxonomy_term');
- // Count parents of $term[2].
- $parents = $storage->loadParents($term[2]->id());
- $this->assertEqual(2, count($parents), 'The term has two parents.');
-
- // Count parents of $term[3].
- $parents = $storage->loadParents($term[3]->id());
- $this->assertEqual(1, count($parents), 'The term has one parent.');
-
- // Identify all ancestors of $term[2].
- $ancestors = $storage->loadAllParents($term[2]->id());
- $this->assertEqual(4, count($ancestors), 'The term has four ancestors including the term itself.');
-
- // Identify all ancestors of $term[3].
- $ancestors = $storage->loadAllParents($term[3]->id());
- $this->assertEqual(5, count($ancestors), 'The term has five ancestors including the term itself.');
- }
-}
diff --git a/core/modules/taxonomy/src/Tests/TermUnitTest.php b/core/modules/taxonomy/src/Tests/TermUnitTest.php
new file mode 100644
index 0000000..3f302b2
--- /dev/null
+++ b/core/modules/taxonomy/src/Tests/TermUnitTest.php
@@ -0,0 +1,131 @@
+createVocabulary();
+ $valid_term = $this->createTerm($vocabulary);
+ // Delete a valid term.
+ $valid_term->delete();
+ $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
+ $this->assertTrue(empty($terms), 'Vocabulary is empty after deletion');
+
+ // Delete an invalid term. Should not throw any notices.
+ entity_delete_multiple('taxonomy_term', array(42));
+ }
+
+ /**
+ * Deleting a parent of a term with multiple parents does not delete the term.
+ */
+ function testMultipleParentDelete() {
+ $vocabulary = $this->createVocabulary();
+ $parent_term1 = $this->createTerm($vocabulary);
+ $parent_term2 = $this->createTerm($vocabulary);
+ $child_term = $this->createTerm($vocabulary);
+ $child_term->parent = array($parent_term1->id(), $parent_term2->id());
+ $child_term->save();
+ $child_term_id = $child_term->id();
+
+ $parent_term1->delete();
+ $term_storage = $this->container->get('entity.manager')->getStorage('taxonomy_term');
+ $term_storage->resetCache(array($child_term_id));
+ $child_term = Term::load($child_term_id);
+ $this->assertTrue(!empty($child_term), 'Child term is not deleted if only one of its parents is removed.');
+
+ $parent_term2->delete();
+ $term_storage->resetCache(array($child_term_id));
+ $child_term = Term::load($child_term_id);
+ $this->assertTrue(empty($child_term), 'Child term is deleted if all of its parents are removed.');
+ }
+
+ /**
+ * Test a taxonomy with terms that have multiple parents of different depths.
+ */
+ function testTaxonomyVocabularyTree() {
+ // Create a new vocabulary with 6 terms.
+ $vocabulary = $this->createVocabulary();
+ $term = array();
+ for ($i = 0; $i < 6; $i++) {
+ $term[$i] = $this->createTerm($vocabulary);
+ }
+
+ // Set the weight on $term[1] so it appears before $term[5] when fetching
+ // the parents for $term[2], in order to test for a regression on
+ // \Drupal\taxonomy\TermStorageInterface::loadAllParents().
+ $term[1]->weight = -1;
+ $term[1]->save();
+
+ // $term[2] is a child of 1 and 5.
+ $term[2]->parent = array($term[1]->id(), $term[5]->id());
+ $term[2]->save();
+ // $term[3] is a child of 2.
+ $term[3]->parent = array($term[2]->id());
+ $term[3]->save();
+ // $term[5] is a child of 4.
+ $term[5]->parent = array($term[4]->id());
+ $term[5]->save();
+
+ /**
+ * Expected tree:
+ * term[0] | depth: 0
+ * term[1] | depth: 0
+ * -- term[2] | depth: 1
+ * ---- term[3] | depth: 2
+ * term[4] | depth: 0
+ * -- term[5] | depth: 1
+ * ---- term[2] | depth: 2
+ * ------ term[3] | depth: 3
+ */
+ // Count $term[1] parents with $max_depth = 1.
+ $tree = taxonomy_get_tree($vocabulary->id(), $term[1]->id(), 1);
+ $this->assertEqual(1, count($tree), 'We have one parent with depth 1.');
+
+ // Count all vocabulary tree elements.
+ $tree = taxonomy_get_tree($vocabulary->id());
+ $this->assertEqual(8, count($tree), 'We have all vocabulary tree elements.');
+
+ // Count elements in every tree depth.
+ foreach ($tree as $element) {
+ if (!isset($depth_count[$element->depth])) {
+ $depth_count[$element->depth] = 0;
+ }
+ $depth_count[$element->depth]++;
+ }
+ $this->assertEqual(3, $depth_count[0], 'Three elements in taxonomy tree depth 0.');
+ $this->assertEqual(2, $depth_count[1], 'Two elements in taxonomy tree depth 1.');
+ $this->assertEqual(2, $depth_count[2], 'Two elements in taxonomy tree depth 2.');
+ $this->assertEqual(1, $depth_count[3], 'One element in taxonomy tree depth 3.');
+
+ /** @var \Drupal\taxonomy\TermStorageInterface $storage */
+ $storage = \Drupal::entityManager()->getStorage('taxonomy_term');
+ // Count parents of $term[2].
+ $parents = $storage->loadParents($term[2]->id());
+ $this->assertEqual(2, count($parents), 'The term has two parents.');
+
+ // Count parents of $term[3].
+ $parents = $storage->loadParents($term[3]->id());
+ $this->assertEqual(1, count($parents), 'The term has one parent.');
+
+ // Identify all ancestors of $term[2].
+ $ancestors = $storage->loadAllParents($term[2]->id());
+ $this->assertEqual(4, count($ancestors), 'The term has four ancestors including the term itself.');
+
+ // Identify all ancestors of $term[3].
+ $ancestors = $storage->loadAllParents($term[3]->id());
+ $this->assertEqual(5, count($ancestors), 'The term has five ancestors including the term itself.');
+ }
+}
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index e857beb..6c5a076 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -34,13 +34,6 @@
font-weight: bold;
}
-/* ----- Toolbar menu tray for viewports less than 320px ------ */
-@media screen and (max-width: 319px) {
- .toolbar .toolbar-tray-vertical.active {
- width: 100%;
- }
-}
-
/**
* Items.
*/
diff --git a/core/modules/update/templates/update-project-status.html.twig b/core/modules/update/templates/update-project-status.html.twig
index 0db548d..04ab882 100644
--- a/core/modules/update/templates/update-project-status.html.twig
+++ b/core/modules/update/templates/update-project-status.html.twig
@@ -110,9 +110,10 @@
{% if base_themes %}
{% set basethemes = base_themes|join(', ') %}
+ {# Using passthrough since placeholder is already applied in preprocess. #}
{% trans %}
- Depends on: {{ basethemes }}
+ Depends on: {{ basethemes|passthrough }}
{% endtrans %}
{% endif %}
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index 2bf04af..033731f 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -383,9 +383,10 @@ public function buildEntity(array $form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function validate(array $form, FormStateInterface $form_state) {
- /** @var \Drupal\user\UserInterface $account */
- $account = parent::validate($form, $form_state);
+ parent::validate($form, $form_state);
+ /** @var \Drupal\user\UserInterface $account */
+ $account = $this->buildEntity($form, $form_state);
// Customly trigger validation of manually added fields and add in
// violations. This is necessary as entity form displays only invoke entity
// validation for fields contained in the display.
@@ -405,8 +406,6 @@ public function validate(array $form, FormStateInterface $form_state) {
$form_state->setErrorByName($field_name, $violation->getMessage());
}
}
-
- return $account;
}
/**
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 8fc92f0..9e66676 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -91,16 +91,16 @@ public function build() {
// Build action links.
$items = array();
if (\Drupal::config('user.settings')->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY) {
- $items['create_account'] = \Drupal::l($this->t('Create new account'), new Url('user.register', array(), array(
+ $items['create_account'] = \Drupal::l(t('Create new account'), new Url('user.register', array(), array(
'attributes' => array(
- 'title' => $this->t('Create a new user account.'),
+ 'title' => t('Create a new user account.'),
'class' => array('create-account-link'),
),
)));
}
- $items['request_password'] = \Drupal::l($this->t('Reset your password'), new Url('user.pass', array(), array(
+ $items['request_password'] = \Drupal::l(t('Reset your password'), new Url('user.pass', array(), array(
'attributes' => array(
- 'title' => $this->t('Send password reset instructions via e-mail.'),
+ 'title' => t('Send password reset instructions via e-mail.'),
'class' => array('request-password-link'),
),
)));
diff --git a/core/modules/user/src/Tests/UserSaveTest.php b/core/modules/user/src/Tests/UserSaveTest.php
index a2eaf5d..fdd468c 100644
--- a/core/modules/user/src/Tests/UserSaveTest.php
+++ b/core/modules/user/src/Tests/UserSaveTest.php
@@ -21,12 +21,7 @@ class UserSaveTest extends WebTestBase {
*/
function testUserImport() {
// User ID must be a number that is not in the database.
-
- $uids = \Drupal::entityManager()->getStorage('user')->getQuery()
- ->sort('uid', 'DESC')
- ->range(0, 1)
- ->execute();
- $max_uid = reset($uids);
+ $max_uid = db_query('SELECT MAX(uid) FROM {users}')->fetchField();
$test_uid = $max_uid + mt_rand(1000, 1000000);
$test_name = $this->randomMachineName();
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php b/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
index 1ffc6d6..ef531b4 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
@@ -38,7 +38,7 @@ class ViewsLocalTask extends DeriverBase implements ContainerDeriverInterface {
*
* @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
* The route provider.
- * @param \Drupal\Core\State\StateInterface $state
+ * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $state
* The state key value store.
*/
public function __construct(RouteProviderInterface $route_provider, StateInterface $state) {
@@ -142,7 +142,6 @@ public function alterLocalTasks(&$local_tasks) {
*
* @return array
* A list of arrays containing the $view and $display_id.
- *
* @code
* array(
* array($view, $display_id),
diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php
index 391046c..d2bfe26 100644
--- a/core/modules/views/src/Plugin/views/display/Block.php
+++ b/core/modules/views/src/Plugin/views/display/Block.php
@@ -173,7 +173,7 @@ public function optionsSummary(&$categories, &$options) {
$options['block_hide_empty'] = array(
'category' => 'other',
'title' => $this->t('Hide block if the view output is empty'),
- 'value' => $this->getOption('block_hide_empty') ? $this->t('Yes') : $this->t('No'),
+ 'value' => $this->getOption('block_hide_empty') ? $this->t('Hide') : $this->t('Show'),
);
}
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index fcf4904..28cdcd1 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -715,7 +715,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#title' => $this->t('Text'),
'#type' => 'textarea',
'#default_value' => $this->options['alter']['text'],
- '#description' => $this->t('The text to display for this field. You may include HTML or
Twig. You may enter data from this view as per the "Replacement patterns" below.', array('@url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())),
+ '#description' => $this->t('The text to display for this field. You may include HTML or
Twig. You may enter data from this view as per the "Replacement patterns" below.', array('@url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation'))),
'#states' => array(
'visible' => array(
':input[name="options[alter][alter_text]"]' => array('checked' => TRUE),
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 0bc5134..bf52fb9 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -203,7 +203,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$form['disable_sql_rewrite'] = array(
'#title' => $this->t('Disable SQL rewriting'),
- '#description' => $this->t('Disabling SQL rewriting will omit all query tags, i. e. disable node access checks as well as override hook_query_alter() implementations in other modules.'),
+ '#description' => $this->t('Disabling SQL rewriting will disable node_access checks as well as other modules that implement hook_query_alter().'),
'#type' => 'checkbox',
'#default_value' => !empty($this->options['disable_sql_rewrite']),
'#suffix' => '
' . $this->t('WARNING: Disabling SQL rewriting means that node access security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Use this option only if you understand and accept this security risk.') . '
',
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 360b717..9c229da 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -686,7 +686,7 @@ public function getField($index, $field) {
* @param $field
* The id of the field.
*/
- public function getFieldValue($index, $field) {
+ protected function getFieldValue($index, $field) {
$this->view->row_index = $index;
$value = $this->view->field[$field]->getValue($this->view->result[$index]);
unset($this->view->row_index);
diff --git a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
index cdc2da5..219ebda 100644
--- a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
@@ -50,8 +50,8 @@ public function testEntityOperations() {
foreach ($entities as $entity) {
$operations = \Drupal::entityManager()->getListBuilder('entity_test')->getOperations($entity);
foreach ($operations as $operation) {
- $expected_destination = Url::fromUri('internal:/test-entity-operations')->toString();
- $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', array(':path' => $operation['url']->toString() . '?destination=' . $expected_destination, ':title' => $operation['title']));
+ $expected_destination = Url::fromUri('internal:/test-entity-operations');
+ $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', array(':path' => $operation['url'] . '?destination=' . $expected_destination, ':title' => $operation['title']));
$this->assertEqual(count($result), 1, t('Found entity @operation link with destination parameter.', array('@operation' => $operation['title'])));
}
}
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 5d00c80..cf43e1a 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -727,7 +727,7 @@ public function renderPreview($display_id, $args = array()) {
if (isset($path)) {
// @todo Views should expect and store a leading /. See:
// https://www.drupal.org/node/2423913
- $path = \Drupal::l($path->toString(), $path);
+ $path = \Drupal::l($path, Url::fromUserInput('/' . $path));
}
else {
$path = t('This display has no path.');
diff --git a/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig b/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
index 3cde0f2..9009d88 100644
--- a/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
+++ b/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
@@ -28,8 +28,8 @@
{% if title -%}
{{ title }}
{%- endif %}
+ {{ content }}
{% if actions -%}
{{ actions }}
{%- endif %}
- {{ content }}