diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 10:50:57 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 10:50:57 +0000 |
| commit | d6405b94fff1853f6654ecb85eea79721827b6ca (patch) | |
| tree | 94eed54194dc8ff3aa2512d66816a0f7e60fc5bb /functions/init | |
| parent | bbfbcfca381146e0ca2a161616513cf2e66f3337 (diff) | |
| download | phpicalendar-d6405b94fff1853f6654ecb85eea79721827b6ca.tar.gz phpicalendar-d6405b94fff1853f6654ecb85eea79721827b6ca.tar.bz2 phpicalendar-d6405b94fff1853f6654ecb85eea79721827b6ca.zip | |
kill admin.php; misc other changes; bump rc num
Diffstat (limited to 'functions/init')
| -rw-r--r-- | functions/init/cpaths.php | 4 | ||||
| -rw-r--r-- | functions/init/date_range.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/functions/init/cpaths.php b/functions/init/cpaths.php index 773f3cb..e728654 100644 --- a/functions/init/cpaths.php +++ b/functions/init/cpaths.php @@ -26,7 +26,7 @@ if (isset($user_template["$cpath"])){ $template = $user_template["$cpath"]; } #set up specific webcals for a particular cpath -if (isset($more_webcals) && is_array($more_webcals[$cpath])){ - $list_webcals = array_merge($list_webcals, $more_webcals["$cpath"]); +if (isset($more_webcals[$cpath]) && is_array($more_webcals[$cpath])){ + foreach ($more_webcals[$cpath] as $wcal)$list_webcals[] = $wcal; } $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file diff --git a/functions/init/date_range.php b/functions/init/date_range.php index d9f7b54..81e9190 100644 --- a/functions/init/date_range.php +++ b/functions/init/date_range.php @@ -33,6 +33,7 @@ switch ($current_view){ $mArray_begin = mktime (0,0,0,$start_month,1,($start_year)); $mArray_end = mktime (0,0,0,$end_month,31,($end_year)); break; + case 'admin': case 'error': case 'preferences': $mArray_begin = time(); |