From 143dfa28c62bce5292c9840766f56d9f288980b5 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 15 Aug 2014 19:15:18 +0200 Subject: [PATCH] [ticket/12620] Rebased on develop PHPBB3-12620 --- phpBB/config/default/parameters.yml | 20 ++++++++++++++++++++ phpBB/config/parameters.yml | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 phpBB/config/parameters.yml diff --git a/phpBB/config/default/parameters.yml b/phpBB/config/default/parameters.yml index e69de29bb2..8ecc1428f4 100644 --- a/phpBB/config/default/parameters.yml +++ b/phpBB/config/default/parameters.yml @@ -0,0 +1,20 @@ +parameters: + # Disable the usage of the super globals (_GET, _POST, _SERVER...) + core.disable_super_globals: true + + # Datetime class to use + datetime.class: \phpbb\datetime + + # Mimetype guesser priorities + mimetype.guesser.priority.lowest: -2 + mimetype.guesser.priority.low: -1 + mimetype.guesser.priority.default: 0 + mimetype.guesser.priority.high: 1 + mimetype.guesser.priority.highest: 2 + + # List of default password driver types + passwords.algorithms: + - passwords.driver.bcrypt_2y + - passwords.driver.bcrypt + - passwords.driver.salted_md5 + - passwords.driver.phpass diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml deleted file mode 100644 index 8ecc1428f4..0000000000 --- a/phpBB/config/parameters.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - # Disable the usage of the super globals (_GET, _POST, _SERVER...) - core.disable_super_globals: true - - # Datetime class to use - datetime.class: \phpbb\datetime - - # Mimetype guesser priorities - mimetype.guesser.priority.lowest: -2 - mimetype.guesser.priority.low: -1 - mimetype.guesser.priority.default: 0 - mimetype.guesser.priority.high: 1 - mimetype.guesser.priority.highest: 2 - - # List of default password driver types - passwords.algorithms: - - passwords.driver.bcrypt_2y - - passwords.driver.bcrypt - - passwords.driver.salted_md5 - - passwords.driver.phpass