From 9776bbf8532d0a952e907c160dc31ce27c0d08e5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 22 Jul 2008 17:12:20 -0400
Subject: Don't allow uploading an attachment with the same name as an existing
 page, to avoid confusion.

---
 IkiWiki/Plugin/attachment.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index acc52f0e9..c6711aa05 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -16,6 +16,12 @@ sub check_canattach ($$;$) {
 	my $dest=shift; # where it's going to be put, under the srcdir
 	my $file=shift; # the path to the attachment currently
 
+	# Don't allow an attachment to be uploaded with the same name as an
+	# existing page.
+	if (exists $pagesources{$dest} && $pagesources{$dest} ne $dest) {
+		error(sprintf(gettext("there is already a page named %s"), $dest));
+	}
+
 	# Use a special pagespec to test that the attachment is valid.
 	my $allowed=1;
 	foreach my $admin (@{$config{adminuser}}) {
-- 
cgit v1.2.3