From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 8 Mar 2015 06:17:20 +0000 (+0100)
Subject: common: fix cookie expire in recent installs
X-Git-Tag: v1.7~30
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/9522b4e1c44d0ac3dc7aafe54357b0b07c9c87cd

common: fix cookie expire in recent installs

Fatal error trying to stringify undef returned for omitted value
since CGI::Cookie v1.30 (CGI v3.51).
---

diff --git a/common.inc.plp b/common.inc.plp
index 563c0e4..f6cd6a6 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -23,15 +23,15 @@ $header{content_type} = 'text/html; charset=utf-8';
 sub stylesheet {
 	my %styles = map {$_ => $_} @_;
 
-	if (exists $get{style}) {
-		$style = $styles{ $get{style} };
+	if (defined( my $setstyle = $get{style} )) {
+		$style = $styles{ $setstyle };
 		eval {
 			require CGI::Cookie;
 			my $cookie = CGI::Cookie->new(
 				-name    => 'style',
-				-value   => $style,
+				-value   => $setstyle || '',
 				-path    => '/',  # site-wide; current page is confusing to most users
-				-expires => $style ? '+5y' : '-1d',
+				-expires => $setstyle ? '+5y' : '-1d',
 			) or die "empty object returned\n";
 			AddCookie($cookie->as_string);
 		} or warn "Unable to create style cookie: $@";