opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

15
web/core/modules/views/src/ViewsDataHelper.php
View file

@ -2,8 +2,7 @@
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.
@ -20,7 +19,7 @@ class ViewsDataHelper {
/**
* A prepared list of all fields, keyed by base_table and handler type.
*
* @param array
* @var array
*/
protected $fields;
@ -120,7 +119,7 @@ class ViewsDataHelper {
}
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) {
$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;
}
$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;
}