diff options
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/meta.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/shortcut.pm | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 74b630afc..2df5a727c 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -193,6 +193,10 @@ sub preprocess (@) { #{{{ " />\n"); } } + elsif ($key eq 'robots') { + push @{$metaheaders{$page}}, '<meta name="robots"'. + ' value="'.encode_entities($value).'" />'; + } else { push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key). '" content="'.encode_entities($value).'" />'); diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index fb096ecbd..c3e1f5446 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -62,6 +62,9 @@ sub shortcut_expand ($$@) { #{{{ }eg; $text=~s/_/ /g; + if (defined $params{desc}) { + $desc=$params{desc}; + } if (defined $desc) { $desc=~s/\%s/$text/g; } |