summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrew <browner12@gmail.com>2014-02-09 23:31:22 +0100
committerAndrew <browner12@gmail.com>2014-02-09 23:31:22 +0100
commit021f8edfee76a1a3a58fe34a1367e876f8f89003 (patch)
treefc259217a6d649b4a8c85378b409c16275496288 /system
parent227a5d7ed9ef65fb1e0c32dc4aaa379c1a96d5b7 (diff)
updates per narfbg's comments
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Calendar.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 977342249..3cb30dba2 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -56,7 +56,7 @@ class CI_Calendar {
/**
* Calendar layout template
*
- * @var string|array
+ * @var mixed
*/
public $template = '';
@@ -528,12 +528,12 @@ class CI_Calendar {
{
$this->replacements = $this->default_template();
- if (!$this->template)
+ if (empty($this->template))
{
return $this;
}
- if(is_string($this->template))
+ if (is_string($this->template))
{
$today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today');
@@ -551,11 +551,12 @@ class CI_Calendar {
return $this;
}
-
- elseif(is_array($this->template))
+ elseif (is_array($this->template))
{
$this->replacements = array_merge($this->replacements, $this->template);
}
+
+ return $this;
}
}