diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
| commit | 13077951b63cf9858dc14ec9cab7f2b53ec88a3e (patch) | |
| tree | e1fc50ddb8c0a4103c945f15d674d85c6655231b /system/libraries/Calendar.php | |
| parent | 9128231452f3ccea857a848b61bd0e6e9e319737 (diff) | |
| parent | b66664b5decd68de50ae6c239c8d995d6c088d94 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/libraries/Calendar.php')
| -rw-r--r-- | system/libraries/Calendar.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 969a7610a..a49f171b9 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -155,7 +155,7 @@ class CI_Calendar { public function generate($year = '', $month = '', $data = array()) { // Set and validate the supplied month/year - if ($year === '') + if (empty($year)) { $year = date('Y', $this->local_time); } @@ -168,7 +168,7 @@ class CI_Calendar { $year = '20'.$year; } - if ($month === '') + if (empty($month)) { $month = date('m', $this->local_time); } |