Only store authorsort in meta pagestate if it differs from author

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 553f9345587889cc779c27679cc5e14ddccf65e2..34e902bec4d19d98730612e6ee78cc157ce7299d 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,13 +88,18 @@ sub preprocess (@) {
 
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
-               $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+               my $encoded = HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{title} = $encoded;
+
                if (exists $params{sortas}) {
                        $pagestate{$page}{meta}{titlesort}=$params{sortas};
                }
-               else {
+               elsif ($encoded ne $value) {
                        $pagestate{$page}{meta}{titlesort}=$value;
                }
+               else {
+                       delete $pagestate{$page}{meta}{titlesort};
+               }
                return "";
        }
        elsif ($key eq 'description') {
@@ -126,7 +131,7 @@ sub preprocess (@) {
                        $pagestate{$page}{meta}{authorsort}=$params{sortas};
                }
                else {
-                       $pagestate{$page}{meta}{authorsort}=$value;
+                       delete $pagestate{$page}{meta}{authorsort};
                }
                # fallthorough
        }