Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/13995] Fixes for invalid HTML in docs and phpBB #3749

Merged
merged 4 commits into from Jul 8, 2015
Merged

[ticket/13995] Fixes for invalid HTML in docs and phpBB #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
498a516
[ticket/13995] Remove deprecated projection media type
iMattPro Jul 8, 2015
6294c45
[ticket/13995] Remove invalid name element from anchors in Docs
iMattPro Jul 8, 2015
04d34e6
[ticket/13995] Invalid avatar HTML missing space between elements
iMattPro Jul 8, 2015
23db3d0
[ticket/13995] Remove projection from tests
iMattPro Jul 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions phpBB/docs/CHANGELOG.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -4979,7 +4979,7 @@ <h4> Sub-task
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
4 changes: 2 additions & 2 deletions phpBB/docs/FAQ.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -343,7 +343,7 @@ <h1>FAQ</h1>
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
4 changes: 2 additions & 2 deletions phpBB/docs/INSTALL.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -507,7 +507,7 @@ <h4>Advanced settings</h4>
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
4 changes: 2 additions & 2 deletions phpBB/docs/README.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -366,7 +366,7 @@ <h1>Readme</h1>
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
6 changes: 3 additions & 3 deletions phpBB/docs/auth_api.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -110,7 +110,7 @@ <h4>Initialisation</h4>
<p>Following are the methods you are able to use.</p>

<a name="acl"></a><h3>2.i. acl</h3>

<p>The <code>acl</code> method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter an associative array containing user information as stored in the database. This array must contain at least the following information; user_id, user_permissions and user_type. It is called in the following way:</p>

<div class="codebox"><pre>
Expand Down Expand Up @@ -285,7 +285,7 @@ <h4>Initialisation</h4>
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
10 changes: 5 additions & 5 deletions phpBB/docs/coding-guidelines.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down Expand Up @@ -300,9 +300,9 @@ <h4>Variable Names:</h4>
<div class="indent">
<p><code>$current_user</code> is right, but <code>$currentuser</code> and <code> $currentUser</code> are not.</p>
</div>

<p>In JavaScript, variable names should use camel case:</p>

<div class="indent">
<p><code>currentUser</code> is right, but <code>currentuser</code> and <code>current_user</code> are not.</p>
</div>
Expand Down Expand Up @@ -431,7 +431,7 @@ <h4>Where to put the braces:</h4>
...
}</pre>
</div>

<p>In JavaScript code, braces always go on the same line:</p>

<div class="codebox"><pre>
Expand Down Expand Up @@ -2568,7 +2568,7 @@ <h4>Spelling, punctuation, grammar, et cetera:</h4>
</div></div>

<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>

</body>
Expand Down
2 changes: 1 addition & 1 deletion phpBB/includes/functions.php
View file
Open in desktop
Expand Up @@ -4878,7 +4878,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) . '" />';
Expand Down
2 changes: 1 addition & 1 deletion phpBB/phpbb/template/twig/node/includecss.php
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ public function append_asset(\Twig_Compiler $compiler)
$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 changes: 4 additions & 4 deletions tests/template/template_includecss_test.php
View file
Open in desktop
Expand Up @@ -71,19 +71,19 @@ public function template_data()
*/
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="' . $url_base . '/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="' . $url_base . '/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
array(
array('TEST' => 4),
'<link href="' . $url_base . '/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="' . $url_base . '/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
),
);
}
Expand Down