Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / Inline_plugin_option_to_show_full_page_path.mdwn

diff --git a/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn b/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
index ab9cd61e4deca82d4d9494f5002d6ccaef8867a7..69169400968b8b6f4f45847c4ac5871f38fe9146 100644 (file)
--- a/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
+++ b/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
@@ -15,14 +15,16 @@ Cheers,
 > that contains the full page name. Then you just use a modified
 > `inlinepage.tmpl`, that uses that instead of the title. --[[Joey]]
 
-diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
-index 59eabb6..82913ba 100644
---- a/IkiWiki/Plugin/inline.pm
-+++ b/IkiWiki/Plugin/inline.pm
-@@ -229,6 +229,7 @@ sub preprocess_inline (@) { #{{{
-                                       $template->param(content => $content);
-                               }
-                               $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
-+                              $template->param(page => $page);
-                               $template->param(title => pagetitle(basename($page)));
-                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+       diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
+       index 59eabb6..82913ba 100644
+       --- a/IkiWiki/Plugin/inline.pm
+       +++ b/IkiWiki/Plugin/inline.pm
+       @@ -229,6 +229,7 @@ sub preprocess_inline (@) {
+                                               $template->param(content => $content);
+                                       }
+                                       $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+       +                               $template->param(page => $page);
+                                       $template->param(title => pagetitle(basename($page)));
+                                       $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+
+Cool, I'll give it a try, thanks! -- [[AdamShand]]