projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
views
/
src
/
ViewsDataHelper.php
diff --git
a/web/core/modules/views/src/ViewsDataHelper.php
b/web/core/modules/views/src/ViewsDataHelper.php
index 32e6adae8f26be86b108665d82d81acf107a2130..6a9188bee6813bdebf323d46ba6c3cea7cfde9d8 100644
(file)
--- a/
web/core/modules/views/src/ViewsDataHelper.php
+++ b/
web/core/modules/views/src/ViewsDataHelper.php
@@
-2,8
+2,7
@@
namespace Drupal\views;
namespace Drupal\views;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
/**
* Defines a helper class for stuff related to views data.
/**
* Defines a helper class for stuff related to views data.
@@
-20,7
+19,7
@@
class ViewsDataHelper {
/**
* A prepared list of all fields, keyed by base_table and handler type.
*
/**
* A prepared list of all fields, keyed by base_table and handler type.
*
- * @
param
array
+ * @
var
array
*/
protected $fields;
*/
protected $fields;
@@
-120,7
+119,7
@@
class ViewsDataHelper {
}
else {
if ($string != 'base') {
}
else {
if ($string != 'base') {
- $strings[$field][$key][$string] =
SafeMarkup::format
("Error: missing @component", ['@component' => $string]);
+ $strings[$field][$key][$string] =
new FormattableMarkup
("Error: missing @component", ['@component' => $string]);
}
}
}
}
}
}
@@
-174,14
+173,14
@@
class ViewsDataHelper {
* decided.
*/
protected static function fetchedFieldSort($a, $b) {
* decided.
*/
protected static function fetchedFieldSort($a, $b) {
- $a_group =
Unicode::
strtolower($a['group']);
- $b_group =
Unicode::
strtolower($b['group']);
+ $a_group =
mb_
strtolower($a['group']);
+ $b_group =
mb_
strtolower($b['group']);
if ($a_group != $b_group) {
return $a_group < $b_group ? -1 : 1;
}
if ($a_group != $b_group) {
return $a_group < $b_group ? -1 : 1;
}
- $a_title =
Unicode::
strtolower($a['title']);
- $b_title =
Unicode::
strtolower($b['title']);
+ $a_title =
mb_
strtolower($a['title']);
+ $b_title =
mb_
strtolower($b['title']);
if ($a_title != $b_title) {
return $a_title < $b_title ? -1 : 1;
}
if ($a_title != $b_title) {
return $a_title < $b_title ? -1 : 1;
}