diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-27 10:51:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:29:05 +0200 |
| commit | 16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11 (patch) | |
| tree | e4f44b05770bebca7b39ee07561268ea1e0ecbd9 /phpBB/phpbb/plupload/plupload.php | |
| parent | b2957b9d6543737076d96209ba0f12e2fc145a9a (diff) | |
| download | forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.gz forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.bz2 forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.xz forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.zip | |
[ticket/13904] Modify files for changes in ini wrapper
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/plupload/plupload.php')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index 35f3a0071e..0e67ee209b 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -39,7 +39,7 @@ class plupload protected $user; /** - * @var \phpbb\php\ini + * @var \bantu\IniGetWrapper\IniGetWrapper */ protected $php_ini; @@ -67,10 +67,10 @@ class plupload * @param \phpbb\config\config $config * @param \phpbb\request\request_interface $request * @param \phpbb\user $user - * @param \phpbb\php\ini $php_ini + * @param \bantu\IniGetWrapper\IniGetWrapper $php_ini * @param \phpbb\mimetype\guesser $mimetype_guesser */ - public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \phpbb\php\ini $php_ini, \phpbb\mimetype\guesser $mimetype_guesser) + public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \phpbb\mimetype\guesser $mimetype_guesser) { $this->phpbb_root_path = $phpbb_root_path; $this->config = $config; @@ -284,9 +284,9 @@ class plupload public function get_chunk_size() { $max = min( - $this->php_ini->get_bytes('upload_max_filesize'), - $this->php_ini->get_bytes('post_max_size'), - max(1, $this->php_ini->get_bytes('memory_limit')), + $this->php_ini->getBytes('upload_max_filesize'), + $this->php_ini->getBytes('post_max_size'), + max(1, $this->php_ini->getBytes('memory_limit')), $this->config['max_filesize'] ); |