diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
| commit | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch) | |
| tree | f022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/phpbb/datetime.php | |
| parent | f8046cc2533f9f87eb914564c4e0e1215b0f007f (diff) | |
| parent | 2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff) | |
| download | forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2 forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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.php | 2 |
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) { |