Merge remote branch 'smcv/unescaped-meta'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 18:33:51 +0000 (14:33 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 18:33:51 +0000 (14:33 -0400)
Conflicts:
IkiWiki/Plugin/meta.pm

1  2 
IkiWiki/Plugin/meta.pm

index 892f6b2c96a46e93e610a1690d5f19ffa50b7703,9906c3f5713cc567ece9ba8b93e96fcf5f18f831..128a6342c74a4ad13adb2f0521d85ddfb29232bb
@@@ -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') {