From 498a5160176625ba0311a1853c5399372731e623 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 7 Jul 2015 20:09:01 -0700 Subject: [PATCH] [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" />')
 		;
 	}
 }