diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-08-25 17:21:19 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-08-25 17:21:19 -0400 |
commit | b3d65aee1822cce5d8612f05c972d8db32721bee (patch) | |
tree | ea3c32408b2ef9d5bcb21360997d4e00660adc43 /ikiwiki-transition | |
parent | 3548b6214f67209b6ba87b741bf8ec45d3256f4f (diff) | |
parent | 848bb66c37b94b633a378e186e561aebb7bab43a (diff) |
Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
Diffstat (limited to 'ikiwiki-transition')
-rwxr-xr-x | ikiwiki-transition | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ikiwiki-transition b/ikiwiki-transition index 795ab31cb..8a20cf655 100755 --- 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 |