Merge branch 'master' into feature/smarty5

Author: onli

docs/NEWS

@@ -4,6 +4,9 @@ Version 2.6-alpha1 ()
    * Update smarty from v4.3.5 to v5.4.3. This new major version has
      breaking changes, worked around as much as possible in the s9y core
 
+   * Fix an often broken element of old themes by not adding the
+     integrated search box when 2k11 is used as the default theme
+
    * Fix specific search terms (like a - at the end) causing an error
      page when using MySQL/MariaDB (thanks to  GuillaumeValadas) 
 

templates/2k11/index.tpl

@@ -46,7 +46,7 @@
                 {if $blogDescription}<p>{$blogDescription}</p>{/if}
             </a>
         </div>
-
+        {if $template == "2k11"}
         <form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get">
         <div>
             <input type="hidden" name="serendipity[action]" value="search">
@@ -56,6 +56,7 @@
         </div>
         </form>
         {serendipity_hookPlugin hook="quicksearch_plugin" hookAll="true"}
+        {/if}
         {if $template_option.header_img}
         <img src="{$template_option.header_img|escape}" alt="">
         {/if}

templates/2k11/sidebar.tpl

@@ -2,7 +2,7 @@
 <div id="serendipity{$pluginside}SideBar">
 {/if}
 {foreach from=$plugindata item=item}
-{if $item.class != "serendipity_plugin_quicksearch"}
+{if $item.class != "serendipity_plugin_quicksearch" || $template != "2k11"}
     <section class="sidebar_plugin clearfix {cycle values="odd,even"} {$item.class}">
         {if $item.title != ""}
         <h3>{$item.title}</h3>