X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f025a7ac0769d9bd6e2a24e46f4a2bd82194e48..89fa4c9b4dcee1ce34aa95d6981f73071f6450cf:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index f5b9bb521..cd367da70 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -107,12 +107,12 @@ sub preprocess (@) {
 		# fallthrough
 	}
 	elsif ($key eq 'license') {
-		push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
+		push @{$metaheaders{$page}}, '<link rel="license" href="#pagelicense" />';
 		$pagestate{$page}{meta}{license}=$value;
 		return "";
 	}
 	elsif ($key eq 'copyright') {
-		push @{$metaheaders{$page}}, '<link rel="copyright" href="#page_copyright" />';
+		push @{$metaheaders{$page}}, '<link rel="copyright" href="#pagecopyright" />';
 		$pagestate{$page}{meta}{copyright}=$value;
 		return "";
 	}
@@ -130,6 +130,7 @@ sub preprocess (@) {
 
 		$value=urlto($link, $page, 1);
 		$pagestate{$page}{meta}{enclosure}=$value;
+		$pagestate{$page}{meta}{enclosurefile}=$link;
 		# fallthrough
 	}
 	elsif ($key eq 'author') {
@@ -154,14 +155,30 @@ sub preprocess (@) {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$IkiWiki::pagectime{$page}=$time if defined $time;
+			if (defined $time) {
+				$IkiWiki::pagectime{$page}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 	elsif ($key eq 'updated') {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$pagestate{$page}{meta}{updated}=$time if defined $time;
+			if (defined $time) {
+				$pagestate{$page}{meta}{updated}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 
@@ -293,6 +310,7 @@ sub preprocess (@) {
 	elsif ($key eq 'name') {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.
 			encode_entities($value).
+			'" '.
 			join(' ', map { "$_=\"$params{$_}\"" } keys %params).
 			' />', $page, $destpage);
 	}