Commit b149b639 authored by alexpott's avatar alexpott

Issue #2599956 by claudiu.cristea, apmsooner: Handler admin summary is double escaped

parent 49e21afc
......@@ -4,7 +4,6 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Ajax\ReplaceCommand;
......@@ -1056,7 +1055,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
$field_name = '(' . $relationships[$field['relationship']] . ') ' . $field_name;
}
$description = Xss::filterAdmin($handler->adminSummary());
$description = $handler->adminSummary();
$link_text = $field_name . (empty($description) ? '' : " ($description)");
$link_attributes = array('class' => array('views-ajax-link'));
if (!empty($field['exclude'])) {
......
......@@ -66,6 +66,11 @@ public function testFilterCriteriaDialog() {
$assert_session->assertWaitOnAjaxRequest();
$remove_link = $page->findLink('Remove group');
$this->assertEmpty($remove_link, 'Remove button not available');
// Checks that the admin summary is not double escaped.
$this->drupalGet('admin/structure/views/view/who_s_online');
$page = $this->getSession()->getPage();
$this->assertNotNull($page->findLink('User: Last access (>= -15 minutes)'));
}
}
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