From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 21 Mar 2008 23:09:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.41~28
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=fd2ddd9e87f758e5d2987708321ec0c6c0dd6898;hp=e8ff29fa330aef5e8d30eeef44218b87c4a9d97e

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b7651ce02..76c1cd42a 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -38,10 +38,10 @@ sub preprocess (@) { #{{{
 	return "" if $params{page} ne $params{destpage};
 
 	if (! exists $params{template} || ! length($params{template})) {
-		return return "[[meta ".gettext("template not specified")."]]";
+		return "[[meta ".gettext("template not specified")."]]";
 	}
 	if (! exists $params{match} || ! length($params{match})) {
-		return return "[[meta ".gettext("match not specified")."]]";
+		return "[[meta ".gettext("match not specified")."]]";
 	}
 
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};