summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-14 01:43:07 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-14 01:43:07 +0200
commit35d6b35182b6ed65c34ca7bf06975b93f4cd403b (patch)
tree550e2351d5670951033338c9d394ca647ce584ee /user_guide_src
parentd461934184d95b0cfb2feec93f27b621ef72a5c2 (diff)
parent7400965017f87c3aba18bf75ed7d732359fd577d (diff)
Merge pull request #1223 from Razican/new_date
New now() function for the Date helper
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/helpers/date_helper.rst18
-rw-r--r--user_guide_src/source/installation/upgrade_300.rst11
3 files changed, 23 insertions, 7 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 039e8acf3..1f5bcb648 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,6 +48,7 @@ Release Date: Not Released
- Helpers
+ - Date helper will now return now() based on the timezone you specify.
- ``create_captcha()`` accepts additional colors parameter, allowing for color customization.
- ``url_title()`` will now trim extra dashes from beginning and end.
- Added XHTML Basic 1.1 doctype to :doc:`HTML Helper <helpers/html_helper>`.
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 18216c5a2..1b7177fc2 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -21,13 +21,21 @@ now()
=====
Returns the current time as a Unix timestamp, referenced either to your
-server's local time or GMT, based on the "time reference" setting in
-your config file. If you do not intend to set your master time reference
-to GMT (which you'll typically do if you run a site that lets each user
-set their own timezone settings) there is no benefit to using this
+server's local time or any PHP suported timezone, based on the "time reference"
+setting in your config file. If you do not intend to set your master time reference
+to any other PHP suported timezone (which you'll typically do if you run a site that
+lets each user set their own timezone settings) there is no benefit to using this
function over PHP's time() function.
-.. php:method:: now()
+.. php:method:: now($timezone = NULL)
+
+ :param string $timezone: The timezone you want to be returned
+ :returns: integer
+
+::
+ echo now("Australia/Victoria");
+
+If a timezone is not provided, it will return time() based on "time_reference" setting.
mdate()
=======
diff --git a/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst
index 63c4227dc..d8a3d5bc1 100644
--- a/user_guide_src/source/installation/upgrade_300.rst
+++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -41,8 +41,15 @@ need to rename the `$active_record` variable to `$query_builder`.
$active_group = 'default';
// $active_record = TRUE;
$query_builder = TRUE;
-
-Step 5: Move your errors folder
+
+Step 5: Change your use of the Date helper's now() function
+===========================================================
+
+Function now() has been modified. You can see the changes in :doc:`Date Helper <../helpers/date_helper>`.
+You can now select all PHP supported timezones in the `time_reference` setting, listed here:
+`Supported timezones <http://www.php.net/timezones>`_. You can also use 'local' if you want to get time().
+
+Step 6: Move your errors folder
===============================
In version 3.0.0, the errors folder has been moved from "application/errors" to "application/views/errors". \ No newline at end of file