aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/files/upload.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-27 10:51:10 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:29:05 +0200
commit16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11 (patch)
treee4f44b05770bebca7b39ee07561268ea1e0ecbd9 /phpBB/phpbb/files/upload.php
parentb2957b9d6543737076d96209ba0f12e2fc145a9a (diff)
downloadforums-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/files/upload.php')
-rw-r--r--phpBB/phpbb/files/upload.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index 036f216d22..328dd49a06 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -56,7 +56,7 @@ class upload
/** @var \phpbb\files\factory Files factory */
protected $factory;
- /** @var \phpbb\php\ini ini_get() wrapper */
+ /** @var \bantu\IniGetWrapper\IniGetWrapper ini_get() wrapper */
protected $php_ini;
/** @var \phpbb\language\language Language class */
@@ -74,11 +74,11 @@ class upload
* @param filesystem_interface $filesystem
* @param factory $factory Files factory
* @param language $language Language class
- * @param \phpbb\php\ini $php_ini ini_get() wrapper
+ * @param \bantu\IniGetWrapper\IniGetWrapper $php_ini ini_get() wrapper
* @param request_interface $request Request class
* @param string $phpbb_root_path phpBB root path
*/
- public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \phpbb\php\ini $php_ini, request_interface $request, $phpbb_root_path)
+ public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path)
{
$this->filesystem = $filesystem;
$this->factory = $factory;
@@ -216,7 +216,7 @@ class upload
switch ($errorcode)
{
case UPLOAD_ERR_INI_SIZE:
- $max_filesize = $this->php_ini->get_string('upload_max_filesize');
+ $max_filesize = $this->php_ini->getString('upload_max_filesize');
$unit = 'MB';
if (!empty($max_filesize))