diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 22:40:37 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 23:15:49 +0100 |
| commit | 677b5b2cd4937ee6c777728082084c661223dee8 (patch) | |
| tree | 4342890f46004943e15a2cfd8ccdd559619bb53c /phpBB/phpbb/controller/helper.php | |
| parent | 93f61a4a7d34f8ad565bdc1605784284994ecdfc (diff) | |
| download | forums-677b5b2cd4937ee6c777728082084c661223dee8.tar forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.gz forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.bz2 forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.xz forums-677b5b2cd4937ee6c777728082084c661223dee8.zip | |
[ticket/12620] Fix rebase
PHPBB3-12620
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index cc327882e0..2bc8e6b9d0 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -41,8 +41,9 @@ class helper protected $config; /** - * @var \phpbb\routing\router phpBB router - */ + * phpBB router + * @var \phpbb\routing\router + */ protected $router; /* @var \phpbb\symfony_request */ |