From ed54f94ee7824e6e0a7fc8ed9e411a3646514856 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 27 Apr 2007 17:01:52 +0000
Subject: minor improvements

---
 IkiWiki.pm                    | 8 ++++----
 doc/plugins/testpagespec.mdwn | 6 +++---
 doc/todo/fileupload.mdwn      | 6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 212b0de08..6fcd69a23 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1012,8 +1012,8 @@ sub pagespec_match ($$;@) { #{{{
 package IkiWiki::FailReason;
 
 use overload (
-	'""'	=> sub { return ${$_[0]} },
-	'0+'	=> sub { return 0 },
+	'""'	=> sub { ${$_[0]} },
+	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
 	fallback => 1,
 );
@@ -1025,8 +1025,8 @@ sub new {
 package IkiWiki::SuccessReason;
 
 use overload (
-	'""'	=> sub { return ${$_[0]} },
-	'0+'	=> sub { return 1 },
+	'""'	=> sub { ${$_[0]} },
+	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
 	fallback => 1,
 );
diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn
index c5155129d..3d35d70ad 100644
--- a/doc/plugins/testpagespec.mdwn
+++ b/doc/plugins/testpagespec.mdwn
@@ -13,10 +13,10 @@ highlighting which part of the [[PageSpec]] is causing the match to fail.
 	
 	\[[testpagespec pagespec="foopage or !bar*" match="barpage"]]
 
-This will print out something like "no match: bar* matches barpage", since the part
-of the [[PageSpec]] that fails is this negated match.
+This will print out something like "no match: bar* matches barpage", since
+the part of the [[PageSpec]] that fails is this negated match.
 	
 	\[[testpagespec pagespec="foopage or barpage" match="barpage"]]
 
 This will print out something like "match: barpage matches barpage",
-indicating the part of the [[PageSpec]] that did match.
+indicating the part of the [[PageSpec]] that caused it to match.
diff --git a/doc/todo/fileupload.mdwn b/doc/todo/fileupload.mdwn
index 3a8bd2c19..1962d6b40 100644
--- a/doc/todo/fileupload.mdwn
+++ b/doc/todo/fileupload.mdwn
@@ -54,4 +54,10 @@ That would obsolete the current simple admin prefs for banned users and
 locked pages. Suddenly all the access controls live in one place.
 Wonderbar!
 
+(Note that pagespec_match will now return an object that stringifies to a
+message indicating why the pagespec matched, or failed to match, so if a
+pagespec lock like the above prevents an edit or upload from happening,
+ikiwiki could display a reasonable message to the user, indicating what
+they've done wrong.)
+
 [[tag soc]]
-- 
cgit v1.2.3