From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 18:33:51 +0000 (-0400)
Subject: Merge remote branch 'smcv/unescaped-meta'
X-Git-Tag: 3.20100427~188
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=002d9e3cb52eadc8c2feb6bfac020b0651c6e0b7;p=ikiwiki.git

Merge remote branch 'smcv/unescaped-meta'

Conflicts:
	IkiWiki/Plugin/meta.pm
---

002d9e3cb52eadc8c2feb6bfac020b0651c6e0b7
diff --cc IkiWiki/Plugin/meta.pm
index 892f6b2c9,9906c3f57..128a6342c
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@@ -88,18 -88,7 +88,13 @@@ sub preprocess (@) 
  
  	# Metadata collection that needs to happen during the scan pass.
  	if ($key eq 'title') {
- 		my $encoded = HTML::Entities::encode_numeric($value);
- 		$pagestate{$page}{meta}{title} = $encoded;
- 
+ 		$pagestate{$page}{meta}{title}=$value;
 +		if (exists $params{sortas}) {
 +			$pagestate{$page}{meta}{titlesort}=$params{sortas};
 +		}
- 		elsif ($encoded ne $value) {
- 			$pagestate{$page}{meta}{titlesort}=$value;
- 		}
 +		else {
 +			delete $pagestate{$page}{meta}{titlesort};
 +		}
  		return "";
  	}
  	elsif ($key eq 'description') {