diff --git a/core/includes/pager.inc b/core/includes/pager.inc index 4c497ba..ed8ba1a 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -253,7 +253,7 @@ function theme_pager($variables) { if ($i > 1) { $items[] = array( '#wrapper_attributes' => array('class' => array('pager-ellipsis')), - '#markup' => '…', + '#markup' => '…', ); } // Now generate the actual pager piece. @@ -292,7 +292,7 @@ function theme_pager($variables) { if ($i < $pager_max) { $items[] = array( '#wrapper_attributes' => array('class' => array('pager-ellipsis')), - '#markup' => '…', + '#markup' => '…', ); } } diff --git a/core/lib/Drupal/Component/Utility/Unicode.php b/core/lib/Drupal/Component/Utility/Unicode.php index 6bbddbb..ec72b9f 100644 --- a/core/lib/Drupal/Component/Utility/Unicode.php +++ b/core/lib/Drupal/Component/Utility/Unicode.php @@ -464,7 +464,7 @@ public static function truncate($string, $max_length, $wordsafe = FALSE, $add_el if ($add_ellipsis) { // Truncate ellipsis in case $max_length is small. - $ellipsis = static::substr('…', 0, $max_length); + $ellipsis = static::substr('…', 0, $max_length); $max_length -= static::strlen($ellipsis); $max_length = max($max_length, 0); } diff --git a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php index 5f49a6d..18f3b32 100644 --- a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php @@ -291,45 +291,45 @@ public function providerTruncate() { array('frànçAIS is über-åwesome', 17, 'frànçAIS is über-'), array('以呂波耳・ほへとち。リヌルヲ。', 6, '以呂波耳・ほ'), array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', FALSE, TRUE), - array('frànçAIS is über-åwesome', 23, 'frànçAIS is über-åweso…', FALSE, TRUE), - array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', FALSE, TRUE), - array('123', 1, '…', TRUE, TRUE), - array('123', 2, '1…', TRUE, TRUE), + array('frànçAIS is über-åwesome', 23, 'frànçAIS is über-åweso…', FALSE, TRUE), + array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', FALSE, TRUE), + array('123', 1, '…', TRUE, TRUE), + array('123', 2, '1…', TRUE, TRUE), array('123', 3, '123', TRUE, TRUE), - array('1234', 3, '12…', TRUE, TRUE), + array('1234', 3, '12…', TRUE, TRUE), array('1234567890', 10, '1234567890', TRUE, TRUE), - array('12345678901', 10, '123456789…', TRUE, TRUE), + array('12345678901', 10, '123456789…', TRUE, TRUE), array('12345678901', 11, '12345678901', TRUE, TRUE), - array('123456789012', 11, '1234567890…', TRUE, TRUE), + array('123456789012', 11, '1234567890…', TRUE, TRUE), array('12345 7890', 10, '12345 7890', TRUE, TRUE), - array('12345 7890', 9, '12345…', TRUE, TRUE), + array('12345 7890', 9, '12345…', TRUE, TRUE), array('123 567 90', 10, '123 567 90', TRUE, TRUE), - array('123 567 901', 10, '123 567…', TRUE, TRUE), + array('123 567 901', 10, '123 567…', TRUE, TRUE), array('Stop. Hammertime.', 17, 'Stop. Hammertime.', TRUE, TRUE), - array('Stop. Hammertime.', 16, 'Stop…', TRUE, TRUE), + array('Stop. Hammertime.', 16, 'Stop…', TRUE, TRUE), array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', TRUE, TRUE), - array('frànçAIS is über-åwesome', 23, 'frànçAIS is über…', TRUE, TRUE), - array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', TRUE, TRUE), + array('frànçAIS is über-åwesome', 23, 'frànçAIS is über…', TRUE, TRUE), + array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', TRUE, TRUE), array('¿Dónde está el niño?', 20, '¿Dónde está el niño?', TRUE, TRUE), - array('¿Dónde está el niño?', 19, '¿Dónde está el…', TRUE, TRUE), - array('¿Dónde está el niño?', 13, '¿Dónde está…', TRUE, TRUE), - array('¿Dónde está el niño?', 10, '¿Dónde…', TRUE, TRUE), + array('¿Dónde está el niño?', 19, '¿Dónde está el…', TRUE, TRUE), + array('¿Dónde está el niño?', 13, '¿Dónde está…', TRUE, TRUE), + array('¿Dónde está el niño?', 10, '¿Dónde…', TRUE, TRUE), array('Help! Help! Help!', 17, 'Help! Help! Help!', TRUE, TRUE), - array('Help! Help! Help!', 16, 'Help! Help!…', TRUE, TRUE), - array('Help! Help! Help!', 15, 'Help! Help!…', TRUE, TRUE), - array('Help! Help! Help!', 14, 'Help! Help!…', TRUE, TRUE), - array('Help! Help! Help!', 13, 'Help! Help!…', TRUE, TRUE), - array('Help! Help! Help!', 12, 'Help! Help!…', TRUE, TRUE), - array('Help! Help! Help!', 11, 'Help! Help…', TRUE, TRUE), - array('Help! Help! Help!', 10, 'Help!…', TRUE, TRUE), - array('Help! Help! Help!', 9, 'Help!…', TRUE, TRUE), - array('Help! Help! Help!', 8, 'Help!…', TRUE, TRUE), - array('Help! Help! Help!', 7, 'Help!…', TRUE, TRUE), - array('Help! Help! Help!', 6, 'Help!…', TRUE, TRUE), - array('Help! Help! Help!', 5, 'Help…', TRUE, TRUE), - array('Help! Help! Help!', 4, 'Hel…', TRUE, TRUE), - array('Help! Help! Help!', 3, 'He…', TRUE, TRUE), - array('Help! Help! Help!', 2, 'H…', TRUE, TRUE), + array('Help! Help! Help!', 16, 'Help! Help!…', TRUE, TRUE), + array('Help! Help! Help!', 15, 'Help! Help!…', TRUE, TRUE), + array('Help! Help! Help!', 14, 'Help! Help!…', TRUE, TRUE), + array('Help! Help! Help!', 13, 'Help! Help!…', TRUE, TRUE), + array('Help! Help! Help!', 12, 'Help! Help!…', TRUE, TRUE), + array('Help! Help! Help!', 11, 'Help! Help…', TRUE, TRUE), + array('Help! Help! Help!', 10, 'Help!…', TRUE, TRUE), + array('Help! Help! Help!', 9, 'Help!…', TRUE, TRUE), + array('Help! Help! Help!', 8, 'Help!…', TRUE, TRUE), + array('Help! Help! Help!', 7, 'Help!…', TRUE, TRUE), + array('Help! Help! Help!', 6, 'Help!…', TRUE, TRUE), + array('Help! Help! Help!', 5, 'Help…', TRUE, TRUE), + array('Help! Help! Help!', 4, 'Hel…', TRUE, TRUE), + array('Help! Help! Help!', 3, 'He…', TRUE, TRUE), + array('Help! Help! Help!', 2, 'H…', TRUE, TRUE), ); }