1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Joas Schilling
2014-08-10 15:24:43 +02:00
48 changed files with 80 additions and 68 deletions

View File

@@ -0,0 +1,2 @@
parameters:
datetime.class: \phpbb\datetime

View File

@@ -11,6 +11,7 @@ imports:
- { resource: passwords.yml }
- { resource: profilefields.yml }
- { resource: twig.yml }
- { resource: parameters.yml }
services:
acl.permissions:
@@ -350,6 +351,8 @@ services:
user:
class: phpbb\user
arguments:
- %datetime.class%
user_loader:
class: phpbb\user_loader