From 498a5160176625ba0311a1853c5399372731e623 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 7 Jul 2015 20:09:01 -0700 Subject: [ticket/13995] Remove deprecated projection media type PHPBB3-13995 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/docs/FAQ.html | 2 +- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 2 +- phpBB/docs/auth_api.html | 4 ++-- phpBB/docs/coding-guidelines.html | 8 ++++---- phpBB/phpbb/template/twig/node/includecss.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c9b292ab6d..d1d447f4fb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -6,7 +6,7 @@ phpBB • Changelog - + diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 0b3b421e72..fdaf520fb6 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -6,7 +6,7 @@ phpBB • FAQ - + diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index d1c0fe1438..437ddc9536 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -6,7 +6,7 @@ phpBB • Install - + diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index f5ac3ecacd..fd0f6304a3 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -6,7 +6,7 @@ phpBB • Readme - + diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index d571e72dd4..a348435183 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:

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 4c5fe73543..08cd02766b 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:

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" />')
 		;
 	}
 }
-- 
cgit v1.2.1


From 6294c45bd39a28adc52813e4dbe903b40d28c9d4 Mon Sep 17 00:00:00 2001
From: Matt Friedman 
Date: Tue, 7 Jul 2015 20:09:47 -0700
Subject: [ticket/13995] Remove invalid name element from anchors in Docs

PHPBB3-13995
---
 phpBB/docs/CHANGELOG.html         | 2 +-
 phpBB/docs/FAQ.html               | 2 +-
 phpBB/docs/INSTALL.html           | 2 +-
 phpBB/docs/README.html            | 2 +-
 phpBB/docs/auth_api.html          | 2 +-
 phpBB/docs/coding-guidelines.html | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index d1d447f4fb..8bd7ac47e0 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -4979,7 +4979,7 @@
- +
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index fdaf520fb6..4786d8d796 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -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 437ddc9536..132367dd0a 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -507,7 +507,7 @@
- +
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index fd0f6304a3..21639045a3 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -366,7 +366,7 @@
- +
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index a348435183..27d090c296 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -285,7 +285,7 @@ $auth_admin = new auth_admin();
- +
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 08cd02766b..26189235ef 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2568,7 +2568,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
- +
-- cgit v1.2.1 From 04d34e6c8bd8d5cbb79ac52b381ef284d2f70434 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 7 Jul 2015 20:10:18 -0700 Subject: [ticket/13995] Invalid avatar HTML missing space between elements PHPBB3-13995 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 27c286c598..82aa91429c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4878,7 +4878,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) $src = 'src="' . $avatar_data['src'] . '"'; } - $html = ''; -- cgit v1.2.1 From 23db3d0b8378577e39d8b81ff9fee1cea461a6c9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 8 Jul 2015 08:11:04 -0700 Subject: [ticket/13995] Remove projection from tests PHPBB3-13995 --- tests/template/template_includecss_test.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index 49bd9dec8b..4ef9b90ec4 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -71,19 +71,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), - '', + '', ), ); } -- cgit v1.2.1