From 0fae8d8b69ab191f98608f1dad224a6c6f99d858 Mon Sep 17 00:00:00 2001
From: Sjoerd <Sjoerd@web>
Date: Sun, 3 Jan 2010 21:37:37 +0000
Subject:

---
 ...plugin_sets_editurl_even_when_editpage_is_disabled.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html

(limited to 'doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html')

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
new file mode 100644
index 000000000..e4e37b34a
--- /dev/null
+++ b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
@@ -0,0 +1,14 @@
+see subject, simple patch below
+<pre>
+--- a/IkiWiki/Plugin/inline.pm
++++ b/IkiWiki/Plugin/inline.pm
+@@ -371,7 +371,8 @@ sub preprocess_inline (@) {
+          }
+          if (length $config{cgiurl} && defined $type) {
+            $template->param(have_actions => 1);
+-           $template->param(editurl => cgiurl(do => "edit", page => $page));
++           $template->param(editurl => cgiurl(do => "edit", page => $page))
++             if IkiWiki->can("cgi_editpage");
+          }
+        }
+</pre>
-- 
cgit v1.2.3


From aed16b4833f98eda566f75b6a1a679febc1ba5ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 12:54:18 -0500
Subject: inline: Avoid showing edit links if page editing is disabled.
 (Sjoerd)

---
 IkiWiki/Plugin/inline.pm                                           | 5 ++++-
 debian/changelog                                                   | 7 +++++++
 .../inline_plugin_sets_editurl_even_when_editpage_is_disabled.html | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ec99300b3..401852513 100644
--- 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 02d3ec65b..df3490640 100644
--- 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 e4e37b34a..62c91a932 100644
--- 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]]
-- 
cgit v1.2.3