diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 01:12:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 01:12:04 +0200 |
| commit | fbbd835b2c9d447fb6a26d6170fffd4c60201ac4 (patch) | |
| tree | 68f5b89851480edd1f1ff05e348c9b1934c020e6 /phpBB/phpbb/template/twig/tokenparser/includephp.php | |
| parent | a0d2c6ab140445104b3c22d307ab37723744b721 (diff) | |
| parent | f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b (diff) | |
| download | forums-fbbd835b2c9d447fb6a26d6170fffd4c60201ac4.tar forums-fbbd835b2c9d447fb6a26d6170fffd4c60201ac4.tar.gz forums-fbbd835b2c9d447fb6a26d6170fffd4c60201ac4.tar.bz2 forums-fbbd835b2c9d447fb6a26d6170fffd4c60201ac4.tar.xz forums-fbbd835b2c9d447fb6a26d6170fffd4c60201ac4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (30 commits)
[ticket/12715] Add missing new line in the notification manager
[ticket/12715] Cleanup comments in \phpbb\symfony_request
[ticket/12715] Cleanup comments in \phpbb\permissions
[ticket/12715] Cleanup comments in \phpbb\path_helper
[ticket/12715] Cleanup comments in \phpbb\pagination
[ticket/12715] Cleanup comments in \phpbb\datetime
[ticket/12715] Cleanup comments in \phpbb\content_visibility
[ticket/12715] Cleanup comments in \phpbb\tree\*
[ticket/12715] Cleanup comments in \phpbb\template\*
[ticket/12715] Cleanup comments in \phpbb\plupload\*
[ticket/12715] Cleanup comments in \phpbb\profilefields\*
[ticket/12715] Cleanup comments in \phpbb\passwords\*
[ticket/12715] Cleanup comments in \phpbb\notification\*
[ticket/12715] Cleanup comments in \phpbb\mimetype\*
[ticket/12715] Cleanup comments in \phpbb\message\*
[ticket/12715] Cleanup comments in \phpbb\log\*
[ticket/12715] Cleanup comments in \phpbb\lock\*
[ticket/12715] Cleanup comments in \phpbb\groupposition\*
[ticket/12715] Cleanup comments in \phpbb\feed\*
[ticket/12715] Cleanup comments in \phpbb\extension\*
...
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/includephp.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/includephp.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php index f745c320c2..38196c5290 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includephp.php +++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php @@ -18,12 +18,12 @@ namespace phpbb\template\twig\tokenparser; class includephp extends \Twig_TokenParser { /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ + * Parses a token and returns a node. + * + * @param \Twig_Token $token A Twig_Token instance + * + * @return \Twig_NodeInterface A Twig_NodeInterface instance + */ public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); @@ -44,10 +44,10 @@ class includephp extends \Twig_TokenParser } /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ + * Gets the tag name associated with this token parser. + * + * @return string The tag name + */ public function getTag() { return 'INCLUDEPHP'; |