Commit fa140d27 authored by webchick's avatar webchick

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

parent 75d9d826
......@@ -29,7 +29,10 @@ public function testMetaTag() {
$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.');
}
}
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment