allow misctemplate callers to pass params to suppress actions etc
Suppress disiplay of small search for on search results page, and of Prefrences link on prefs page.master
parent
4c6fa6413f
commit
c8b34aa31c
|
@ -1745,6 +1745,7 @@ sub misctemplate ($$;@) {
|
|||
run_hooks(pagetemplate => sub {
|
||||
shift->(page => "", destpage => "", template => $template);
|
||||
});
|
||||
templateactions($template, "");
|
||||
|
||||
$template->param(
|
||||
dynamic => 1,
|
||||
|
@ -1755,8 +1756,6 @@ sub misctemplate ($$;@) {
|
|||
html5 => $config{html5},
|
||||
@_,
|
||||
);
|
||||
|
||||
templateactions($template, "");
|
||||
|
||||
return $template->output;
|
||||
}
|
||||
|
|
|
@ -247,7 +247,9 @@ sub cgi_prefs ($$) {
|
|||
$form->text(gettext("Preferences saved."));
|
||||
}
|
||||
|
||||
showform($form, $buttons, $session, $q);
|
||||
showform($form, $buttons, $session, $q,
|
||||
prefsurl => "", # avoid showing the preferences link
|
||||
);
|
||||
}
|
||||
|
||||
sub cgi_custom_failure ($$$) {
|
||||
|
|
|
@ -229,7 +229,8 @@ sub setupfiles () {
|
|||
# Avoid omega interpreting anything in the misctemplate
|
||||
# as an omegascript command.
|
||||
my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
|
||||
searching => 1);
|
||||
searchform => "", # avoid showing the small search form
|
||||
);
|
||||
eval q{use HTML::Entities};
|
||||
error $@ if $@;
|
||||
$misctemplate=encode_entities($misctemplate, '\$');
|
||||
|
|
|
@ -48,11 +48,9 @@
|
|||
</TMPL_IF>
|
||||
</span>
|
||||
</span>
|
||||
<TMPL_UNLESS SEARCHING>
|
||||
<TMPL_IF SEARCHFORM>
|
||||
<TMPL_VAR SEARCHFORM>
|
||||
</TMPL_IF>
|
||||
</TMPL_UNLESS>
|
||||
<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
|
||||
|
||||
<TMPL_IF HAVE_ACTIONS>
|
||||
|
|
Loading…
Reference in New Issue