diff options
| -rw-r--r-- | IkiWiki.pm | 1 | ||||
| -rw-r--r-- | templates/page.tmpl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index d20a3709c..54271becc 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1757,7 +1757,6 @@ sub misctemplate ($$;@) { baseurl => baseurl(), html5 => $config{html5}, have_actions => 0, # force off - searchform => 0, # ditto parentlinks => [{ # override url => $config{url}, page => $config{wikiname}, diff --git a/templates/page.tmpl b/templates/page.tmpl index f5257058c..eb76cafa6 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -52,9 +52,11 @@ </TMPL_IF> </span> </span> +<TMPL_IF ISPAGE> <TMPL_IF NAME="SEARCHFORM"> <TMPL_VAR SEARCHFORM> </TMPL_IF> +</TMPL_IF> <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> <TMPL_IF NAME="HAVE_ACTIONS"> @@ -184,8 +186,8 @@ Last edited <TMPL_VAR MTIME> </div> <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> -</TMPL_IF> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> +</TMPL_IF> <!-- from <TMPL_VAR WIKINAME> --> <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> |