diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c9b292ab6d..8bd7ac47e0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -6,7 +6,7 @@ phpBB • Changelog - + @@ -4979,7 +4979,7 @@
- +
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 0b3b421e72..4786d8d796 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -6,7 +6,7 @@ phpBB • FAQ - + @@ -343,7 +343,7 @@ I want to sue you because i think you host an illegal board!
- +
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 711f92b39d..a0e63092f0 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -6,7 +6,7 @@ phpBB • Install - + @@ -507,7 +507,7 @@
- +
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 9bddfd56d4..1d6530b4da 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -6,7 +6,7 @@ phpBB • Readme - + @@ -366,7 +366,7 @@
- +
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index d571e72dd4..27d090c296 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -6,7 +6,7 @@ phpBB3 • Auth API - + @@ -110,7 +110,7 @@ $auth = new phpbb\auth\auth();

Following are the methods you are able to use.

2.i. acl

- +

The acl 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:

@@ -285,7 +285,7 @@ $auth_admin = new auth_admin();
- +
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 4c5fe73543..26189235ef 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -6,7 +6,7 @@ phpBB3 • Coding Guidelines - + @@ -300,9 +300,9 @@ PHPBB_QA (Set board to QA-Mode, which means the updater also c

$current_user is right, but $currentuser and $currentUser are not.

- +

In JavaScript, variable names should use camel case:

- +

currentUser is right, but currentuser and current_user are not.

@@ -431,7 +431,7 @@ function do_stuff() ... } - +

In JavaScript code, braces always go on the same line:

@@ -2568,7 +2568,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
- +
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bb4fc5dbae..49fd732bb8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4053,7 +4053,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) $src = 'src="' . $avatar_data['src'] . '"'; } - $html = ''; diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php index 2ce63402aa..2dac154036 100644 --- a/phpBB/phpbb/template/twig/node/includecss.php +++ b/phpBB/phpbb/template/twig/node/includecss.php @@ -31,7 +31,7 @@ class includecss extends \phpbb\template\twig\node\includeasset $compiler ->raw("raw("\$asset_file . '\"") - ->raw(' rel="stylesheet" type="text/css" media="screen, projection" />') + ->raw(' rel="stylesheet" type="text/css" media="screen" />') ; } } diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index 062fc9493b..ea851e3568 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -95,19 +95,19 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te */ array( array('TEST' => 1), - '', + '', ), array( array('TEST' => 2), - '', + '', ), array( array('TEST' => 3), - '', + '', ), array( array('TEST' => 4), - '', + '', ), ); }