X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/678d467a4080dd549f2b6f276f963eac384e1b4f..235136f55c92646069de67fb0743ef2f7d26cd49:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 759bfbc65..e509a7c2f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,15 +1536,19 @@ sub run_hooks ($$) {
 	my $sub=shift;
 
 	if (exists $hooks{$type}) {
-		my @deferred;
+		my (@first, @middle, @last);
 		foreach my $id (keys %{$hooks{$type}}) {
-			if ($hooks{$type}{$id}{last}) {
-				push @deferred, $id;
-				next;
+			if ($hooks{$type}{$id}{first}) {
+				push @first, $id;
+			}
+			elsif ($hooks{$type}{$id}{last}) {
+				push @last, $id;
+			}
+			else {
+				push @middle, $id;
 			}
-			$sub->($hooks{$type}{$id}{call});
 		}
-		foreach my $id (@deferred) {
+		foreach my $id (@first, @middle, @last) {
 			$sub->($hooks{$type}{$id}{call});
 		}
 	}
@@ -1596,37 +1600,6 @@ sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
 
-sub globlist_to_pagespec ($) {
-	my @globlist=split(' ', shift);
-
-	my (@spec, @skip);
-	foreach my $glob (@globlist) {
-		if ($glob=~/^!(.*)/) {
-			push @skip, $glob;
-		}
-		else {
-			push @spec, $glob;
-		}
-	}
-
-	my $spec=join(' or ', @spec);
-	if (@skip) {
-		my $skip=join(' and ', @skip);
-		if (length $spec) {
-			$spec="$skip and ($spec)";
-		}
-		else {
-			$spec=$skip;
-		}
-	}
-	return $spec;
-}
-
-sub is_globlist ($) {
-	my $s=shift;
-	return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-}
-
 sub safequote ($) {
 	my $s=shift;
 	$s=~s/[{}]//g;
@@ -1718,26 +1691,12 @@ sub pagespec_merge ($$) {
 	my $b=shift;
 
 	return $a if $a eq $b;
-
-        # Support for old-style GlobLists.
-        if (is_globlist($a)) {
-                $a=globlist_to_pagespec($a);
-        }
-        if (is_globlist($b)) {
-                $b=globlist_to_pagespec($b);
-        }
-
 	return "($a) or ($b)";
 }
 
 sub pagespec_translate ($) {
 	my $spec=shift;
 
-	# Support for old-style GlobLists.
-	if (is_globlist($spec)) {
-		$spec=globlist_to_pagespec($spec);
-	}
-
 	# Convert spec to perl code.
 	my $code="";
 	while ($spec=~m{