summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/helpers
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-17 18:19:08 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-17 18:19:08 +0200
commitd926b8fbd9e25d7c088a055cd29bbf6a93f69a8c (patch)
tree8cdc3bba85f523b4bc13e4a8ba8d915603b75049 /user_guide_src/source/helpers
parent5600828101627a76768e4f1edbb0197d11885318 (diff)
parent3e414f9f72e387449d9e3984e1869b386564deaf (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch-2
Diffstat (limited to 'user_guide_src/source/helpers')
-rw-r--r--user_guide_src/source/helpers/date_helper.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 378ff362b..ad06dd628 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -162,7 +162,8 @@ Example
::
- $mysql = '20061124092345'; $unix = mysql_to_unix($mysql);
+ $mysql = '20061124092345';
+ $unix = mysql_to_unix($mysql);
unix_to_human()
===============