|
From: <par...@us...> - 2009-06-22 14:31:06
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25952 Modified Files: day.php month.php week.php Log Message: Fix minical_view config - Thanks Roberto: bug #2800880 Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** day.php 15 May 2009 21:50:08 -0000 1.138 --- day.php 22 Jun 2009 14:31:03 -0000 1.139 *************** *** 16,20 **** require_once(BASE.'functions/template.php'); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'day'; $weekstart = 1; --- 16,27 ---- require_once(BASE.'functions/template.php'); ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $weekstart = 1; Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** month.php 7 Jan 2009 21:11:39 -0000 1.152 --- month.php 22 Jun 2009 14:31:03 -0000 1.153 *************** *** 6,10 **** require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; $unix_time = strtotime($getdate); --- 6,18 ---- require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $unix_time = strtotime($getdate); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** week.php 15 May 2009 21:50:08 -0000 1.138 --- week.php 22 Jun 2009 14:31:03 -0000 1.139 *************** *** 6,10 **** require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! if ($phpiCal_config->minical_view == "current") $minical_view = "week"; $starttime = "0500"; --- 6,18 ---- require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $starttime = "0500"; |