makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	tests/template/template_includecss_test.php
This commit is contained in:
Marc Alexander 2015-07-08 22:54:26 +02:00
commit 01097a24b5
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/docs/CHANGELOG.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="phpBB 3.1.x Changelog" />
<title>phpBB &bull; Changelog</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -4979,7 +4979,7 @@
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

4
phpBB/docs/FAQ.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="phpBB 3.1.x frequently asked questions" />
<title>phpBB &bull; FAQ</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -343,7 +343,7 @@ I want to sue you because i think you host an illegal board!</h2>
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

4
phpBB/docs/INSTALL.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="phpBB 3.1.x Installation, updating and conversion informations" />
<title>phpBB &bull; Install</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -507,7 +507,7 @@
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

4
phpBB/docs/README.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="phpBB 3.1.x Readme" />
<title>phpBB &bull; Readme</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -366,7 +366,7 @@
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

4
phpBB/docs/auth_api.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
<title>phpBB3 &bull; Auth API</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -285,7 +285,7 @@ $auth_admin = new auth_admin();</pre>
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

4
phpBB/docs/coding-guidelines.html
View file

@ -6,7 +6,7 @@
<meta name="description" content="Ascraeus coding guidelines document" />
<title>phpBB3 &bull; Coding Guidelines</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@ -2568,7 +2568,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>

2
phpBB/includes/functions.php
View file

@ -4053,7 +4053,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
$src = 'src="' . $avatar_data['src'] . '"';
}
$html = '<img class="avatar" ' . $src .
$html = '<img class="avatar" ' . $src . ' ' .
($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';

2
phpBB/phpbb/template/twig/node/includecss.php
View file

@ -31,7 +31,7 @@ class includecss extends \phpbb\template\twig\node\includeasset
$compiler
->raw("<link href=\"' . ")
->raw("\$asset_file . '\"")
->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
->raw(' rel="stylesheet" type="text/css" media="screen" />')
;
}
}

8
tests/template/template_includecss_test.php
View file

@ -95,19 +95,19 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
*/
array(
array('TEST' => 1),
'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
array(
array('TEST' => 2),
'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
array(
array('TEST' => 3),
'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="tests/template//ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
array(
array('TEST' => 4),
'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href=tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
);
}