diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-15 15:07:08 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-15 15:07:08 +0200 |
| commit | d9b44bef948928739b2b96b43d78b7629c0ccc15 (patch) | |
| tree | 7912f2cdfd955862191066850db42b500f1e9ae0 | |
| parent | e446ad337945b7839b73f13531b21ed16ece241e (diff) | |
Fix issue #520
| -rw-r--r-- | system/helpers/date_helper.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 077a6712c..065a223ef 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -488,6 +488,10 @@ if ( ! function_exists('nice_date')) { return 'Unknown'; } + elseif (empty($format)) + { + $format = 'U'; + } // Date like: YYYYMM if (preg_match('/^\d{6}$/i', $bad_date)) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 7748f9b37..ec33414c2 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -270,6 +270,7 @@ Bug fixes for 3.0 - Fixed a bug in protect_identifiers() where if passed along with the field names, operators got escaped as well. - Fixed a bug (#10) - :doc:`URI Library <libraries/uri>` internal method _detect_uri() failed with paths containing a colon. - Fixed a bug (#1387) - :doc:`Query Builder <database/query_builder>`'s from() method didn't escape table aliases. +- Fixed a bug (#520) - :doc:`Date Helper <helpers/date_helper>` function nice_date() failed when the optional second parameter is not passed. Version 2.1.1 ============= |