Mercurial > hg > isophonics-drupal-site
diff core/lib/Drupal/Core/Block/BlockBase.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | 4c8ae668cc8c |
children | af1871eacc83 |
line wrap: on
line diff
--- a/core/lib/Drupal/Core/Block/BlockBase.php Tue Jul 10 15:07:59 2018 +0100 +++ b/core/lib/Drupal/Core/Block/BlockBase.php Thu Feb 28 13:21:36 2019 +0000 @@ -4,13 +4,14 @@ use Drupal\Core\Access\AccessResult; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Messenger\MessengerTrait; use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait; use Drupal\Core\Plugin\ContextAwarePluginBase; -use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\NestedArray; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Plugin\PluginWithFormsInterface; use Drupal\Core\Plugin\PluginWithFormsTrait; +use Drupal\Core\Render\PreviewFallbackInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Component\Transliteration\TransliterationInterface; @@ -23,9 +24,10 @@ * * @ingroup block_api */ -abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginInterface, PluginWithFormsInterface { +abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginInterface, PluginWithFormsInterface, PreviewFallbackInterface { use ContextAwarePluginAssignmentTrait; + use MessengerTrait; use PluginWithFormsTrait; /** @@ -244,7 +246,7 @@ // \Drupal\system\MachineNameController::transliterate(), so it might make // sense to provide a common service for the two. $transliterated = $this->transliteration()->transliterate($admin_label, LanguageInterface::LANGCODE_DEFAULT, '_'); - $transliterated = Unicode::strtolower($transliterated); + $transliterated = mb_strtolower($transliterated); $transliterated = preg_replace('@[^a-z0-9_.]+@', '', $transliterated); @@ -252,6 +254,13 @@ } /** + * {@inheritdoc} + */ + public function getPreviewFallbackString() { + return $this->t('Placeholder for the "@block" block', ['@block' => $this->label()]); + } + + /** * Wraps the transliteration service. * * @return \Drupal\Component\Transliteration\TransliterationInterface