diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 12:02:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 12:03:28 +0200 |
| commit | 973682cb2ddba8022622bdccc870925ea6a7237c (patch) | |
| tree | e18041a15f961c4d5e5c58462e98b19a32de4db4 | |
| parent | 4af6270d0fb90a918841d63186497888ffb92bbb (diff) | |
| download | forums-973682cb2ddba8022622bdccc870925ea6a7237c.tar forums-973682cb2ddba8022622bdccc870925ea6a7237c.tar.gz forums-973682cb2ddba8022622bdccc870925ea6a7237c.tar.bz2 forums-973682cb2ddba8022622bdccc870925ea6a7237c.tar.xz forums-973682cb2ddba8022622bdccc870925ea6a7237c.zip | |
[ŧicket/11912] Get rid of obsolete variables in content_guesser
PHPBB3-11912
| -rw-r--r-- | phpBB/config/mimetype_guessers.yml | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/mimetype/content_guesser.php | 29 |
2 files changed, 1 insertions, 31 deletions
diff --git a/phpBB/config/mimetype_guessers.yml b/phpBB/config/mimetype_guessers.yml index c19fb85254..2949b0aa96 100644 --- a/phpBB/config/mimetype_guessers.yml +++ b/phpBB/config/mimetype_guessers.yml @@ -11,9 +11,6 @@ services: mimetype.content_guesser: class: phpbb\mimetype\content_guesser - arguments: - - %core.root_path% - - @php_ini tags: - { name: mimetype.guessers } diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php index e6554666fc..65c4703e2a 100644 --- a/phpBB/phpbb/mimetype/content_guesser.php +++ b/phpBB/phpbb/mimetype/content_guesser.php @@ -24,16 +24,6 @@ if (!defined('IN_PHPBB')) class content_guesser { /** - * @var phpbb_root_path - */ - protected $phpbb_root_path; - - /** - * @var \phpbb\php\ini - */ - protected $php_ini; - - /** * @var file extension map */ protected $extension_map = array( @@ -488,24 +478,7 @@ class content_guesser ); /** - * @const mime_magic_file - */ - const mime_magic_file = 'phpbb/mimetype/fixture/magic.mgc'; - - /** - * Construct a content_guesser object - * - * @param string $phpbb_root_path phpBB root path - * @param \phpbb\php\ini $php_ini - */ - public function __construct($phpbb_root_path, \phpbb\php\ini $php_ini) - { - $this->phpbb_root_path = $phpbb_root_path; - $this->php_ini = $php_ini; - } - - /** - * + * @inheritdoc */ public function is_supported() { |