X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f8a7fb227b59463b37180b1e525c5d19ec0e43cb..8fa8bd0adb034f05131648dcb7b14011672649e8:/IkiWiki/Plugin/conditional.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 58e2b04b9..a7ed6590e 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -62,8 +62,12 @@ sub match_enabled ($$;@) { #{{{
 	my $plugin=shift;
 	
 	# test if the plugin is enabled
-	return 1 if UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import");
-	return IkiWiki::FailReason->new("$plugin is not enabled");
+	if (UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import")) {
+		return IkiWiki::SuccessReason->new("$plugin is enabled");
+	}
+	else {
+		return IkiWiki::FailReason->new("$plugin is not enabled");
+	}
 } #}}}
 
 sub match_sourcepage ($$;@) { #{{{
@@ -72,8 +76,12 @@ sub match_sourcepage ($$;@) { #{{{
 	my %params=@_;
 
 	return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
-	return 1 if match_glob($params{sourcepage}, $glob, @_);
-	return IkiWiki::FailReason->new("sourcepage does not match $glob");
+	if (match_glob($params{sourcepage}, $glob, @_)) {
+		return IkiWiki::SuccessReason->new("sourcepage matches $glob");
+	}
+	else {
+		return IkiWiki::FailReason->new("sourcepage does not match $glob");
+	}
 } #}}}
 
 sub match_destpage ($$;@) { #{{{
@@ -82,8 +90,12 @@ sub match_destpage ($$;@) { #{{{
 	my %params=@_;
 	
 	return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
-	return 1 if match_glob($params{destpage}, $glob, @_);
-	return IkiWiki::FailReason->new("destpage does not match $glob");
+	if (match_glob($params{destpage}, $glob, @_)) {
+		return IkiWiki::SuccessReason->new("destpage matches $glob");
+	}
+	else {
+		return IkiWiki::FailReason->new("destpage does not match $glob");
+	}
 } #}}}
 
 sub match_included ($$;$) { #{{{
@@ -92,8 +104,12 @@ sub match_included ($$;$) { #{{{
 	my %params=@_;
 
 	return IkiWiki::FailReason->new("cannot match included") unless exists $params{sourcepage} && exists $params{destpage};
-	return 1 if $params{sourcepage} ne $params{destpage};
-	return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+	if ($params{sourcepage} ne $params{destpage}) {
+		return IkiWiki::SuccessReason->new("page $params{sourcepage} is included");
+	}
+	else {
+		return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+	}
 } #}}}
 
 1