diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-09 01:47:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-09 01:47:13 +0200 |
| commit | 44295bae74cdb9969a45d81ff5e629ca9e430c95 (patch) | |
| tree | 1b9318506d7d110d58ca81c30498bd251612db19 /phpBB/phpbb | |
| parent | 7b8b8d0417eb1c89606bb8096db9309906186efa (diff) | |
| parent | deaa0a8c758acb14a1944c5d3c1fa24364f503c4 (diff) | |
| download | forums-44295bae74cdb9969a45d81ff5e629ca9e430c95.tar forums-44295bae74cdb9969a45d81ff5e629ca9e430c95.tar.gz forums-44295bae74cdb9969a45d81ff5e629ca9e430c95.tar.bz2 forums-44295bae74cdb9969a45d81ff5e629ca9e430c95.tar.xz forums-44295bae74cdb9969a45d81ff5e629ca9e430c95.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/controller/resolver.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index efab34b701..948a6a218c 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -41,6 +41,12 @@ class resolver implements ControllerResolverInterface protected $template; /** + * Request type cast helper object + * @var \phpbb\request\type_cast_helper + */ + protected $type_cast_helper; + + /** * phpBB root path * @var string */ @@ -59,6 +65,7 @@ class resolver implements ControllerResolverInterface $this->user = $user; $this->container = $container; $this->template = $template; + $this->type_cast_helper = new \phpbb\request\type_cast_helper(); $this->phpbb_root_path = $phpbb_root_path; } @@ -138,7 +145,16 @@ class resolver implements ControllerResolverInterface { if (array_key_exists($param->name, $attributes)) { - $arguments[] = $attributes[$param->name]; + if (is_string($attributes[$param->name])) + { + $value = $attributes[$param->name]; + $this->type_cast_helper->set_var($value, $attributes[$param->name], 'string', true, false); + $arguments[] = $value; + } + else + { + $arguments[] = $attributes[$param->name]; + } } else if ($param->getClass() && $param->getClass()->isInstance($request)) { |