X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e7f97eae6071601aec4d7843f94f6fcb4b45657e..29507e94a46d0f2006671d31ac6812ebd0715cee:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 92d042dc9..2483bf4d8 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,6 +2,7 @@
 
 use warnings;
 use strict;
+use IkiWiki;
 use IkiWiki::UserInfo;
 
 package IkiWiki;
@@ -12,7 +13,7 @@ sub page_locked ($$;$) { #{{{
 	my $nonfatal=shift;
 	
 	my $user=$session->param("name");
-	return if length $user && is_admin($user);
+	return if defined $user && is_admin($user);
 
 	foreach my $admin (@{$config{adminuser}}) {
 		my $locked_pages=userinfo_get($admin, "locked_pages");
@@ -350,7 +351,7 @@ sub cgi_editpage ($$) { #{{{
 		require IkiWiki::Render;
 		$form->tmpl_param("page_preview",
 			htmlize($config{default_pageext},
-				linkify($form->field('content'), $page)));
+				linkify($page, $form->field('content'))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -483,26 +484,21 @@ sub cgi_editpage ($$) { #{{{
 	}
 } #}}}
 
-sub cgi_hyperestraier () { #{{{
-	# only works for GET requests
-	chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
-	exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
-} #}}}
-
 sub cgi () { #{{{
 	eval q{use CGI};
 	eval q{use CGI::Session};
 	
 	my $q=CGI->new;
 	
+	if (exists $hooks{cgi}) {
+		foreach my $id (keys %{$hooks{cgi}}) {
+			$hooks{cgi}{$id}{call}->($q);
+		}
+	}
+	
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
-		if (defined $q->param('phrase')) {
-			cgi_hyperestraier();
-		}
-		else {
-			error("\"do\" parameter missing");
-		}
+		error("\"do\" parameter missing");
 	}
 	
 	# Things that do not need a session.