inline: Avoid showing edit links if page editing is disabled. (Sjoerd)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ec99300b3d5543ca4d73c4769a78e8eaf8e4aa06..401852513d1fbe8d14fe4ebfbf38cadd781c410d 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -369,9 +369,12 @@ sub preprocess_inline (@) {
                                                                        forcesubpage => 1));
                                                }
                                        }
-                                       if (length $config{cgiurl} && defined $type) {
+                                       if (length $config{cgiurl} &&
+                                           defined $type &&
+                                           IkiWiki->can("cgi_editpage")) {
                                                $template->param(have_actions => 1);
                                                $template->param(editurl => cgiurl(do => "edit", page => $page));
+
                                        }
                                }
        

diff --git a/debian/changelog b/debian/changelog
index 02d3ec65bb89602ab234f3c5f60e0cc7131291a0..df3490640abe9435a825b35daab51e8cfebd9243 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100104) UNRELEASED; urgency=low
+
+  * inline: Avoid showing edit links if page editing is disabled.
+    (Sjoerd)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+
 ikiwiki (3.20100102.3) unstable; urgency=low
 
   Happy palindrome day!

diff --git a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
index e4e37b34a93612cf3d798b24407c971280e96d63..62c91a932b821faf6d2313877f2704af0dcaa22d 100644 (file)
--- a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
+++ b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
@@ -12,3 +12,5 @@ see subject, simple patch below
           }
         }
 </pre>
+
+[[done]] --[[Joey]]