adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.5

Browse source
This commit is contained in:
mark_story 2013-11-18 21:49:13 -05:00
commit 3b8208be2e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
View file

@ -1757,6 +1757,14 @@ class HtmlHelperTest extends CakeTestCase {
) )
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
$this->Html->request->webroot = '/testing/';
$result = $this->Html->meta('icon');
$expected = array(
'link' => array('href' => '/testing/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'icon'),
array('link' => array('href' => '/testing/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'shortcut icon'))
);
$this->assertTags($result, $expected);
} }
/** /**

2
lib/Cake/View/Helper/HtmlHelper.php
View file

@ -253,7 +253,7 @@ class HtmlHelper extends AppHelper {
); );
if ($type === 'icon' && $url === null) { if ($type === 'icon' && $url === null) {
$types['icon']['link'] = $this->webroot('favicon.ico'); $types['icon']['link'] = 'favicon.ico';
} }
if (isset($types[$type])) { if (isset($types[$type])) {