summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-17 14:17:32 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-17 14:17:32 +0100
commitad6c373711c1975098cc0e3cd9780e16499a4732 (patch)
treee2ba858c779d06930ff8134c90849c6cc1db3189 /system/helpers
parent4658307730c82874a73a9581da9194179f1b9b9a (diff)
parent69779afa2882576d5e45f752dcee4107a07e27b0 (diff)
Merge pull request #2003 from webmasterar/develop
Corrected phpdoc comment for mysql_to_unix() method
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/date_helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 7a0552b0b..d54e01968 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -360,8 +360,8 @@ if ( ! function_exists('mysql_to_unix'))
/**
* Converts a MySQL Timestamp to Unix
*
- * @param int Unix timestamp
- * @return int
+ * @param int MySQL timestamp YYYY-MM-DD HH:MM:SS
+ * @return int Unix timstamp
*/
function mysql_to_unix($time = '')
{