Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8351
Modified Files:
index.php print.php
Log Message:
SF Patch # 1093772 - copied the changes out, and "applied" the patch. $printview_default works again.
Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php 2 Sep 2004 18:39:51 -0000 1.8
--- index.php 6 May 2005 21:44:50 -0000 1.9
***************
*** 8,12 ****
}
if ($printview_default == 'yes') {
! $default_view = "print.php?printview=$default_view";
} else {
$default_view = "$default_view" . ".php";
--- 8,13 ----
}
if ($printview_default == 'yes') {
! $printview = $default_view;
! $default_view = "print.php";
} else {
$default_view = "$default_view" . ".php";
***************
*** 16,18 ****
include( $default_view );
! ?>
\ No newline at end of file
--- 17,19 ----
include( $default_view );
! ?>
Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** print.php 16 Apr 2005 20:25:23 -0000 1.34
--- print.php 6 May 2005 21:44:50 -0000 1.35
***************
*** 10,17 ****
$end_week_time = $start_week_time + (6 * 25 * 60 * 60);
$parse_month = date ("Ym", strtotime($getdate));
- $printview = $_GET['printview'];
$cal_displayname = str_replace("32", " ", $cal);
$events_week = 0;
$unix_time = strtotime($getdate);
if ($printview == 'day') {
--- 10,17 ----
$end_week_time = $start_week_time + (6 * 25 * 60 * 60);
$parse_month = date ("Ym", strtotime($getdate));
$cal_displayname = str_replace("32", " ", $cal);
$events_week = 0;
$unix_time = strtotime($getdate);
+ if (!$printview) $printview = $_GET['printview'];
if ($printview == 'day') {
|