Issue #2628916 by tassos, vaibhavjain: Block example does not use multibyte string functions

tassos · paul-m · commit 8ee1a98d5406 · 2018-05-06T12:31:22.000-07:00
diff --git a/block_example/block_example.module b/block_example/block_example.module
@@ -42,7 +42,7 @@ use Drupal\Core\Block\BlockPluginInterface;
 function block_example_block_view_alter(array &$build, BlockPluginInterface $block) {
   // We'll search for the string 'uppercase'.
   $definition = $block->getPluginDefinition();
-  if ((!empty($build['#configuration']['label']) && stristr($build['#configuration']['label'], 'uppercase')) || (!empty($definition['subject']) && stristr($definition['subject'], 'uppercase'))) {
+  if ((!empty($build['#configuration']['label']) && Unicode::strpos($build['#configuration']['label'], 'uppercase')) || (!empty($definition['subject']) && Unicode::strpos($definition['subject'], 'uppercase'))) {
     // This will uppercase the block title.
     $build['#configuration']['label'] = Unicode::strtoupper($build['#configuration']['label']);
   }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ use Drupal\Core\Block\BlockPluginInterface;`
`42`	`42`	`function block_example_block_view_alter(array &$build, BlockPluginInterface $block) {`
`43`	`43`	`// We'll search for the string 'uppercase'.`
`44`	`44`	`$definition = $block->getPluginDefinition();`
`45`		`- if ((!empty($build['#configuration']['label']) && stristr($build['#configuration']['label'], 'uppercase')) \|\| (!empty($definition['subject']) && stristr($definition['subject'], 'uppercase'))) {`
	`45`	`+ if ((!empty($build['#configuration']['label']) && Unicode::strpos($build['#configuration']['label'], 'uppercase')) \|\| (!empty($definition['subject']) && Unicode::strpos($definition['subject'], 'uppercase'))) {`
`46`	`46`	`// This will uppercase the block title.`
`47`	`47`	`$build['#configuration']['label'] = Unicode::strtoupper($build['#configuration']['label']);`
`48`	`48`	`}`