X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/deb39a1f14a840761f32011f28fe698015d8b298..21f44880cdd8f23264b2416bf39793aadcb87df6:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 586dbcb81..d2c6e7f8b 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -46,18 +46,10 @@ sub scrub ($) { #{{{
 sub htmlize ($$$) { #{{{
 	my $page = shift;
 	my $destpage = shift;
-	my $text = shift;
 
-	$text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+	return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
 		IkiWiki::linkify($page, $destpage,
-		IkiWiki::preprocess($page, $destpage, $text)));
-
-	# hack to get rid of enclosing junk added by markdown
-	$text=~s!^<p>!!;
-	$text=~s!</p>$!!;
-	chomp $text;
-
-	return $text;
+		IkiWiki::preprocess($page, $destpage, shift)));
 }
 
 sub preprocess (@) { #{{{
@@ -81,13 +73,6 @@ sub preprocess (@) { #{{{
 	if ($key eq 'title') {
 		$title{$page}=HTML::Entities::encode_numeric($value);
 	}
-	elsif ($key eq 'date') {
-		eval q{use Date::Parse};
-		if (! $@) {
-			my $time = str2time($value);
-			$IkiWiki::pagectime{$page}=$time if defined $time;
-		}
-	}
 	elsif ($key eq 'license') {
 		push @{$meta{$page}}, '<link rel="license" href="#page_license" />';
 		$license{$page}=$value;
@@ -118,7 +103,14 @@ sub preprocess (@) { #{{{
 	}
 
 	# Metadata collection that happens only during preprocessing pass.
-	if ($key eq 'permalink') {
+	if ($key eq 'date') {
+		eval q{use Date::Parse};
+		if (! $@) {
+			my $time = str2time($value);
+			$IkiWiki::pagectime{$page}=$time if defined $time;
+		}
+	}
+	elsif ($key eq 'permalink') {
 		$permalink{$page}=$value;
 		push @{$meta{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
 	}
@@ -184,7 +176,7 @@ sub preprocess (@) { #{{{
 	}
 	elsif ($key eq 'link') {
 		if (%params) {
-			$meta{$page}.=scrub("<link href=\"".encode_entities($value)."\" ".
+			push @{$meta{$page}}, scrub("<link href=\"".encode_entities($value)."\" ".
 				join(" ", map {
 					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
 				} keys %params).