Skip to content

Commit f7492e5

Browse files
authored
Merge pull request #8545 from kenjis/fix-word-UNIX-timestamp
docs: use word "UNIX timestamp" for consistency
2 parents b371688 + 3ba06c1 commit f7492e5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

user_guide_src/source/libraries/cookies/004.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$cookie->getName(); // 'remember_token'
2323
$cookie->getPrefix(); // '__Secure-'
2424
$cookie->getPrefixedName(); // '__Secure-remember_token'
25-
$cookie->getExpiresTimestamp(); // Unix timestamp
25+
$cookie->getExpiresTimestamp(); // UNIX timestamp
2626
$cookie->getExpiresString(); // 'Fri, 14-Feb-2025 00:00:00 GMT'
2727
$cookie->isExpired(); // false
2828
$cookie->getMaxAge(); // the difference from time() to expires

user_guide_src/source/models/model.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ $dateFormat
184184

185185
This value works with `$useTimestamps`_ and `$useSoftDeletes`_ to ensure that the correct type of
186186
date value gets inserted into the database. By default, this creates DATETIME values, but
187-
valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using `$useSoftDeletes`_ or
187+
valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a UNIX timestamp). Using `$useSoftDeletes`_ or
188188
`$useTimestamps`_ with an invalid or missing `$dateFormat`_ will cause an exception.
189189

190190
$createdField

0 commit comments

Comments
 (0)