Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mention that pagespec_match returns an overloaded value
[git.ikiwiki.info.git]
/
ikiwiki-transition
diff --git
a/ikiwiki-transition
b/ikiwiki-transition
index 795ab31cb046f8c3c7c579d6b2606432f8a3115c..8a20cf655f021b328eef5afe509a75908f202d2a 100755
(executable)
--- a/
ikiwiki-transition
+++ b/
ikiwiki-transition
@@
-335,4
+335,14
@@
sub get_banned_users () {
return @ret;
}
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+ my $a=shift;
+ my $b=shift;
+
+ return $a if $a eq $b;
+ return "($a) or ($b)";
+}
+
1