oops

diff --git a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
index 0b9f6f939f816cb9516c8d411945ebc8388b23d0..d28d492c22b23a5b3fce03d0c51129efce6c8778 100644 (file)
--- a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
+++ b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
@@ -81,108 +81,6 @@ Index: IkiWiki/Plugin/inline.pm
        }
  
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
-Index: doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
-===================================================================
---- doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn (revision 4066)
-+++ doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn (working copy)
-@@ -4,50 +4,54 @@
- element (whose datetime format is [iso 8601](http://www.w3.org/TR/NOTE-datetime)). 
- This patch updates :) `inline.pm` and the two relevant templates.
- 
--    --- inline.pm.orig      2007-08-07 05:44:26.000000000 +0200
--    +++ inline.pm   2007-08-07 05:47:37.000000000 +0200
--    @@ -362,7 +362,9 @@
--                            url => $u,
--                            permalink => $u,
--                            date_822 => date_822($pagectime{$p}),
--    +                       mdate_822 => date_822($pagemtime{$p}),
--                            date_3339 => date_3339($pagectime{$p}),
--    +                       mdate_3339 => date_3339($pagemtime{$p}),
--                    );
--     
--                    if ($itemtemplate->query(name => "enclosure")) {
--    @@ -397,7 +399,7 @@
--                    $content.=$itemtemplate->output;
--                    $itemtemplate->clear_params;
--     
--    -               $lasttime = $pagectime{$p} if $pagectime{$p} > $lasttime;
--    +               $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
--            }
--     
--            my $template=template($feedtype."page.tmpl", blind_cache => 1);
--    --- atomitem.tmpl.orig  2007-08-07 05:44:43.000000000 +0200
--    +++ atomitem.tmpl       2007-08-07 05:46:14.000000000 +0200
--    @@ -11,7 +11,8 @@
--            <category term="<TMPL_VAR CATEGORY>" />
--            </TMPL_LOOP>
--            </TMPL_IF>
--    -       <updated><TMPL_VAR DATE_3339></updated>
--    +       <updated><TMPL_VAR MDATE_3339></updated>
--    +       <published><TMPL_VAR DATE_3339></published>
--            <TMPL_IF NAME="ENCLOSURE">
--            <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
--            <TMPL_ELSE>
--    --- rssitem.tmpl.orig   2007-08-07 05:44:58.000000000 +0200
--    +++ rssitem.tmpl        2007-08-07 06:06:36.000000000 +0200
--    @@ -5,6 +5,7 @@
--            <TMPL_ELSE>
--            <title><TMPL_VAR TITLE></title>
--            </TMPL_IF>
--    +       <dc:modified><TMPL_VAR MDATE_3339></dc:modified>
--            <guid><TMPL_VAR URL></guid>
--            <link><TMPL_VAR PERMALINK></link>
--            <TMPL_IF NAME="CATEGORIES">
-+<pre>
-+--- inline.pm.orig      2007-08-07 05:44:26.000000000 +0200
-++++ inline.pm   2007-08-07 05:47:37.000000000 +0200
-+@@ -362,7 +362,9 @@
-+                        url => $u,
-+                        permalink => $u,
-+                        date_822 => date_822($pagectime{$p}),
-++                       mdate_822 => date_822($pagemtime{$p}),
-+                        date_3339 => date_3339($pagectime{$p}),
-++                       mdate_3339 => date_3339($pagemtime{$p}),
-+                );
-+ 
-+                if ($itemtemplate->query(name => "enclosure")) {
-+@@ -397,7 +399,7 @@
-+                $content.=$itemtemplate->output;
-+                $itemtemplate->clear_params;
-+ 
-+-               $lasttime = $pagectime{$p} if $pagectime{$p} > $lasttime;
-++               $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
-+        }
-+ 
-+        my $template=template($feedtype."page.tmpl", blind_cache => 1);
-+--- atomitem.tmpl.orig  2007-08-07 05:44:43.000000000 +0200
-++++ atomitem.tmpl       2007-08-07 05:46:14.000000000 +0200
-+@@ -11,7 +11,8 @@
-+        <category term="<TMPL_VAR CATEGORY>" />
-+        </TMPL_LOOP>
-+        </TMPL_IF>
-+-       <updated><TMPL_VAR DATE_3339></updated>
-++       <updated><TMPL_VAR MDATE_3339></updated>
-++       <published><TMPL_VAR DATE_3339></published>
-+        <TMPL_IF NAME="ENCLOSURE">
-+        <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-+        <TMPL_ELSE>
-+--- rssitem.tmpl.orig   2007-08-07 05:44:58.000000000 +0200
-++++ rssitem.tmpl        2007-08-07 06:06:36.000000000 +0200
-+@@ -5,6 +5,7 @@
-+        <TMPL_ELSE>
-+        <title><TMPL_VAR TITLE></title>
-+        </TMPL_IF>
-++       <dc:modified><TMPL_VAR MDATE_3339></dc:modified>
-+        <guid><TMPL_VAR URL></guid>
-+        <link><TMPL_VAR PERMALINK></link>
-+        <TMPL_IF NAME="CATEGORIES">
-+</pre>
- 
- — NicolasLimare
- 
-+[[done]], thanks --[[Joey]]
-+
- [[tag patch]]
 </pre>
 
 — NicolasLimare