diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
| commit | 93ec20b8d9afbf8cb22ec6383b7fb24fe70330e8 (patch) | |
| tree | 8ad006bb39a8caee805fb9dd35912b32fc2d9778 /system/helpers | |
| parent | 7ecc5cda6647a4b316b44dc40d5925d9ef63c908 (diff) | |
| parent | 98ebf4351f8aad58504cd7318ddd94faf0dec482 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/date_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 955d74542..51b2b76db 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -669,7 +669,7 @@ if ( ! function_exists('date_range')) * @param int unix_start UNIX timestamp of period start date * @param int unix_end|days UNIX timestamp of period end date * or interval in days. - * @param mixed is_unix Specifies wether the second parameter + * @param mixed is_unix Specifies whether the second parameter * is a UNIX timestamp or a day interval * - TRUE or 'unix' for a timestamp * - FALSE or 'days' for an interval |