X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/32ef584dc5abb6ddb9f794f94ea0b2934967bba7..47b12458ae0dad36b1fd5502bd2970cd4e5ca809:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 243662386..1db96f9f2 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,11 +58,6 @@ sub cgitemplate ($$$;@) {
 	
 	my $template=template("page.tmpl");
 
-	my $topurl = $config{url};
-	if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) {
-		$topurl = $cgi->url;
-	}
-
 	my $page="";
 	if (exists $params{page}) {
 		$page=delete $params{page};
@@ -299,8 +294,9 @@ sub cgi_prefs ($$) {
 		return;
 	}
 	elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
-		if (defined $form->field('email')) {
-			userinfo_set($user_name, 'email', $form->field('email')) ||
+		my $email = $form->field('email');
+		if (defined $email) {
+			userinfo_set($user_name, 'email', $email) ||
 				error("failed to set email");
 		}