aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/remove.pm8
-rw-r--r--debian/changelog6
-rw-r--r--templates/editpage.tmpl2
3 files changed, 10 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 21028cde3..bb5f56540 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -97,11 +97,11 @@ sub formbuilder (@) { #{{{
removal_confirm($q, $session, 0, $form->field("page"));
}
elsif ($form->submitted eq "Remove Attachments") {
- my @pages=$q->param("attachment_select");
- if (! @pages) {
+ my @selected=$q->param("attachment_select");
+ if (! @selected) {
error(gettext("Please select the attachments to remove."));
}
- removal_confirm($q, $session, 1, @pages);
+ removal_confirm($q, $session, 1, @selected);
}
}
} #}}}
@@ -145,6 +145,8 @@ sub sessioncgi ($$) { #{{{
push @files, IkiWiki::possibly_foolish_untaint($file);
}
+ # TODO check attachment limits.
+
# Do removal, and update the wiki.
require IkiWiki::Render;
if ($config{rcs}) {
diff --git a/debian/changelog b/debian/changelog
index 278e52155..b53d846d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
ikiwiki (2.55) UNRELEASED; urgency=low
+ * remove: New plugin that adds the ability to remove pages via the web.
+ (Sponsored by The TOVA Company.)
+ * rename: New plugin that adds the ability to rename pages via the web.
+ (Sponsored by The TOVA Company.) (This one's for you, Kyle.)
* prefix_directives enabled in doc wiki, all preprocessor directives
converted. (Simon McVittie)
* editpage: Don't show attachments link when attachments are disabled.
* All rcs backends need to implement rcs_remove. (Done for svn, git).
- * remove: New plugin that adds the ability to remove pages via the web.
- (Sponsored by The TOVA Company.)
* tag: Allow tagbase to be overridden by starting a tag with "./" or "/".
(Simon McVittie)
* Really fix bug with links to pages with names containing colons.
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index aa9436173..1c30d1d85 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -71,7 +71,7 @@ Optional comment about this change:<br />
<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
</TMPL_LOOP>
<TMPL_IF NAME="ATTACHMENT_LIST">
-<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-REMOVE><TMPL_VAR FIELD-RENAME></td></tr>
+<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
</TMPL_IF>
</table>
</div>