diff options
author | Andrey Andreev <narf@devilix.net> | 2016-12-01 13:14:18 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-12-01 13:14:18 +0100 |
commit | 9e829e10e6f2d3786c358ca6c8c3ba2a149a6a40 (patch) | |
tree | c38faf49e7274c3edfdb5ebb59ce80ac35fe57d8 /user_guide_src/source/helpers | |
parent | efd856edce0b952c8a7a62ec953ae1baee77ff34 (diff) | |
parent | 8db01f13809a92bac7bc95b02893175d7654d627 (diff) |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'user_guide_src/source/helpers')
-rw-r--r-- | user_guide_src/source/helpers/date_helper.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst index a85da26a4..600a07574 100644 --- a/user_guide_src/source/helpers/date_helper.rst +++ b/user_guide_src/source/helpers/date_helper.rst @@ -84,7 +84,7 @@ The following functions are available: .. note:: This function is DEPRECATED. Use the native ``date()`` combined with `DateTime's format constants - <http://php.net/manual/en/class.datetime.php#datetime.constants.types>`_ + <https://secure.php.net/manual/en/class.datetime.php#datetime.constants.types>`_ instead:: echo date(DATE_RFC822, time()); @@ -220,6 +220,9 @@ The following functions are available: // Should Produce: 2001-09-11 $better_date = nice_date($bad_date, 'Y-m-d'); + .. note:: This function is DEPRECATED. Use PHP's native `DateTime class + <https://secure.php.net/datetime>`_ instead. + .. php:function:: timespan([$seconds = 1[, $time = ''[, $units = '']]]) :param int $seconds: Number of seconds @@ -434,4 +437,4 @@ UP12 (UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand UP1275 (UTC +12:45) Chatham Islands Standard Time UP13 (UTC +13:00) Phoenix Islands Time, Tonga UP14 (UTC +14:00) Line Islands -=========== =====================================================================
\ No newline at end of file +=========== ===================================================================== |