Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2375923 by amateescu, olli: Fixed favicon missing.

8.0.x
webchick 2014-11-17 07:54:12 -08:00
parent 75d9d82631
commit fa140d27b3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/system/src/Tests/Page/DefaultMetatagsTest.php
View File

@ -29,7 +29,10 @@ class DefaultMetatagsTest extends WebTestBase {
$result = $this->xpath('//meta');
$this->assertEqual((string) $result[0]->attributes()->name, 'charset');
$this->assertEqual((string) $result[0]->attributes()->charset, 'utf-8');
// Ensure that the shortcut icon is on the page.
$result = $this->xpath('//link[@rel = "shortcut icon"]');
$this->assertEqual(count($result), 1, 'The shortcut icon is present.');
}
}

2
core/modules/system/system.module
View File

@ -551,7 +551,7 @@ function system_page_attachments(array &$page) {
if (theme_get_setting('features.favicon')) {
$favicon = theme_get_setting('favicon.url');
$type = theme_get_setting('favicon.mimetype');
$element['#attached']['html_head_link'][][] = array(
$page['#attached']['html_head_link'][][] = array(
'rel' => 'shortcut icon',
'href' => UrlHelper::stripDangerousProtocols($favicon),
'type' => $type,