aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/datetime.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:43:45 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:43:45 +0200
commit2f44a865a01d1c9d1198484c7a9e841c22ef267d (patch)
tree1af5a8b36be1540192b3c69d4a5494e4a5e59d65 /phpBB/phpbb/datetime.php
parent83544992ecc013a2ab0a9b7f9f8329853fb2f212 (diff)
parentcea0cfa6f8f41ebeb73a0a90f789bfb4190009b6 (diff)
downloadforums-2f44a865a01d1c9d1198484c7a9e841c22ef267d.tar
forums-2f44a865a01d1c9d1198484c7a9e841c22ef267d.tar.gz
forums-2f44a865a01d1c9d1198484c7a9e841c22ef267d.tar.bz2
forums-2f44a865a01d1c9d1198484c7a9e841c22ef267d.tar.xz
forums-2f44a865a01d1c9d1198484c7a9e841c22ef267d.zip
Merge pull request #2477 from n-aleha/ticket/12557ascraeus
[ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/phpbb/datetime.php')
-rw-r--r--phpBB/phpbb/datetime.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php
index 9c9292a8e4..e674707883 100644
--- a/phpBB/phpbb/datetime.php
+++ b/phpBB/phpbb/datetime.php
@@ -38,9 +38,9 @@ class datetime extends \DateTime
* Constructs a new instance of \phpbb\datetime, expanded to include an argument to inject
* the user context and modify the timezone to the users selected timezone if one is not set.
*
+ * @param user $user object for context.
* @param string $time String in a format accepted by strtotime().
* @param \DateTimeZone $timezone Time zone of the time.
- * @param user $user object for context.
*/
public function __construct($user, $time = 'now', \DateTimeZone $timezone = null)
{