diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
| commit | 941b7287b7dd3477d5ebce8d15a83cdde49e9dd7 (patch) | |
| tree | c8a8873e9419a25e03f70802cac00742ae4f1fd0 /phpBB/config | |
| parent | 029f096411f620f2066608cd0a1e8711f88da9e1 (diff) | |
| parent | 2e2ddd7e85034f747d5dd312803aadfc47ac80e2 (diff) | |
| download | forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.gz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.bz2 forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.xz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.zip | |
Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
[feature/avatars] Update module_auth of ucp module and fix small issues
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[feature/avatars] Use "Main" as category for avatars in root of gallery
[feature/avatars] Remove trailing whitespace from avatar code
[feature/avatars] Pass phpbb_user to prepare and process form functions
[feature/avatars] Document the use of the allowed extensions array
[feature/avatars] Use array for allowed extensions and implode if needed
[feature/avatars] Use deprecated for compatibility function
[feature/avatars] Correct license, copyright and package info
[feature/avatars] Move list of supported formats to avatar driver class
[feature/avatars] Add include of functions_display.php in BC function
[feature/avatars] Add note about when compatibility function was added
[feature/avatars] Add compatibility function for get_user_avatar()
[feature/avatars] Move definition of driver_collection to avatars.yml
[feature/avatars] Remove the obsolete request argument for avatar drivers
[feature/avatars] Add missing @var to docblocks in avatar manager
[feature/avatars] Remove not needed inline style
[feature/avatars] Differentiate tests for get drivers functions
...
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/avatars.yml | 55 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 8 |
2 files changed, 63 insertions, 0 deletions
diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml new file mode 100644 index 0000000000..fa0f07372a --- /dev/null +++ b/phpBB/config/avatars.yml @@ -0,0 +1,55 @@ +services: + avatar.driver.gravatar: + class: phpbb_avatar_driver_gravatar + arguments: + - @config + - %core.root_path% + - .%core.php_ext% + - @cache.driver + calls: + - [set_name, [avatar.driver.gravatar]] + tags: + - { name: avatar.driver } + + avatar.driver.local: + class: phpbb_avatar_driver_local + arguments: + - @config + - %core.root_path% + - .%core.php_ext% + - @cache.driver + calls: + - [set_name, [avatar.driver.local]] + tags: + - { name: avatar.driver } + + avatar.driver.remote: + class: phpbb_avatar_driver_remote + arguments: + - @config + - %core.root_path% + - .%core.php_ext% + - @cache.driver + calls: + - [set_name, [avatar.driver.remote]] + tags: + - { name: avatar.driver } + + avatar.driver.upload: + class: phpbb_avatar_driver_upload + arguments: + - @config + - %core.root_path% + - .%core.php_ext% + - @cache.driver + calls: + - [set_name, [avatar.driver.upload]] + tags: + - { name: avatar.driver } + + avatar.driver_collection: + class: phpbb_di_service_collection + arguments: + - @service_container + tags: + - { name: service_collection, tag: avatar.driver } diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index d4db1f291e..e200b865e8 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -3,11 +3,19 @@ imports: - { resource: cron_tasks.yml } - { resource: notifications.yml } - { resource: migrator.yml } + - { resource: avatars.yml } services: auth: class: phpbb_auth + avatar.manager: + class: phpbb_avatar_manager + arguments: + - @config + - @avatar.driver_collection + - @service_container + cache: class: phpbb_cache_service arguments: |