SF Patch # 1093772 - copied the changes out, and "applied" the patch. $printview_default works again.

2 files changed, 4 insertions, 3 deletions

diff --git a/index.php b/index.php
index 13d55f2..9310f4e 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,8 @@ if (isset($_COOKIE['phpicalendar'])) {
 	$default_view 		= $phpicalendar['cookie_view'];
 }
 if ($printview_default == 'yes') {
-	$default_view = "print.php?printview=$default_view";
+	$printview = $default_view;
+	$default_view = "print.php";
 } else {
 	$default_view = "$default_view" . ".php";
 }
@@ -15,4 +16,4 @@ if ($printview_default == 'yes') {
 
 include( $default_view );
 
-?>
\ No newline at end of file
+?>
diff --git a/print.php b/print.php
index 397ea30..e173765 100644
--- a/print.php
+++ b/print.php
@@ -9,10 +9,10 @@ header("Content-Type: text/html; charset=$charset");
 $start_week_time 	= strtotime(dateOfWeek($getdate, $week_start_day));
 $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)	$printview = $_GET['printview'];
 
 if ($printview == 'day') {
 	$display_date 	= localizeDate ($dateFormat_day, strtotime($getdate));