diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-19 04:17:32 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-08-03 07:12:34 +0300 |
| commit | dfcbace621b5cb28061828b94ed1ed2828a7d2e8 (patch) | |
| tree | 722984a15efe581b93f43308525c9f550a62a89f | |
| parent | 8f2395857e785cf8b7ccb338937b7cd30b329aab (diff) | |
| download | forums-dfcbace621b5cb28061828b94ed1ed2828a7d2e8.tar forums-dfcbace621b5cb28061828b94ed1ed2828a7d2e8.tar.gz forums-dfcbace621b5cb28061828b94ed1ed2828a7d2e8.tar.bz2 forums-dfcbace621b5cb28061828b94ed1ed2828a7d2e8.tar.xz forums-dfcbace621b5cb28061828b94ed1ed2828a7d2e8.zip | |
[ticket/12557] Template fixes
PHPBB3-12557
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/definition.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 9 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/extension.php | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 5a01ee3a93..67dbd7b357 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -24,6 +24,7 @@ class asset * Constructor * * @param string $url URL + * @param \phpbb\path_helper $path_helper Path helper object */ public function __construct($url, \phpbb\path_helper $path_helper) { diff --git a/phpBB/phpbb/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php index 39653f6d26..cb3c953692 100644 --- a/phpBB/phpbb/template/twig/definition.php +++ b/phpBB/phpbb/template/twig/definition.php @@ -25,6 +25,8 @@ class definition * Get a DEFINE'd variable * * @param string $name + * @param array $arguments + * * @return mixed Null if not found */ public function __call($name, $arguments) diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index 8d25153e14..476ffd935e 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -36,11 +36,10 @@ class environment extends \Twig_Environment /** * Constructor * - * @param \phpbb\config\config $phpbb_config - * @param \phpbb\path_helper - * @param \phpbb\extension\manager - * @param string $phpbb_root_path - * @param \Twig_LoaderInterface $loader + * @param \phpbb\config\config $phpbb_config The phpBB configuration + * @param \phpbb\path_helper $path_helper phpBB path helper + * @param \phpbb\extension\manager $extension_manager phpBB extension manager + * @param \Twig_LoaderInterface $loader Twig loader interface * @param array $options Array of options to pass to Twig */ public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array()) diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 8f523684dd..3a983491b9 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -162,7 +162,6 @@ class extension extends \Twig_Extension * (e.g. in the ACP, L_TITLE) * If not, we return the result of $user->lang() * - * @param string $lang name * @return string */ function lang() |