Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2420421 by larowlan: HEAD BROKEN: Fatal error: Cannot use Drupal\Component\Utility\Xss as Xss because the name is already in use in /var/lib/drupaltestbot/sites/default/files/checkout/core/modules/views/src/Plugin/views/field/Field.php on line 11

8.0.x
webchick 2015-02-04 19:48:09 -08:00
parent b8364ecfa9
commit 67cc654b1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/views/src/Plugin/views/field/Field.php
View File

@ -8,7 +8,7 @@
namespace Drupal\views\Plugin\views\field; namespace Drupal\views\Plugin\views\field;
use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss; use Drupal\Component\Utility\Xss as CoreXss;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityStorageInterface;
@ -876,7 +876,7 @@ class Field extends FieldPluginBase implements CacheablePluginInterface, MultiIt
(is_object($item['raw']) ? (array)$item['raw'] : NULL); (is_object($item['raw']) ? (array)$item['raw'] : NULL);
} }
if (isset($raw) && isset($raw[$id]) && is_scalar($raw[$id])) { if (isset($raw) && isset($raw[$id]) && is_scalar($raw[$id])) {
$tokens['{{ ' . $this->options['id'] . '-' . $id . ' }}'] = Xss::filterAdmin($raw[$id]); $tokens['{{ ' . $this->options['id'] . '-' . $id . ' }}'] = CoreXss::filterAdmin($raw[$id]);
} }
else { else {
// Make sure that empty values are replaced as well. // Make sure that empty values are replaced as well.