Fix searching from topbar if search URL contains parameters.

When stopped working to combine form fields and form action URL parameters?

horde/docs/CHANGES

@@ -2,6 +2,7 @@
 v5.0.5-git
 ----------
 
+[jan] Fix searching from topbar if search URL contains parameters.
 
 
 ------

horde/lib/View/Topbar.php

@@ -108,6 +108,11 @@ public function render($name = 'topbar', $locals = array())
         if ($this->search) {
             $GLOBALS['injector']->getInstance('Horde_PageOutput')
                 ->addScriptFile('form_ghost.js', 'horde');
+            if (!isset($this->searchParameters)) {
+                $action = new Horde_Url($this->searchAction);
+                $this->searchAction = $action->url;
+                $this->searchParameters = $action->parameters;
+            }
         }
         $this->sidebar = $GLOBALS['page_output']->sidebar;
         return parent::render($name, $locals);

horde/package.xml

@@ -40,7 +40,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
-* 
+* [jan] Fix searching from topbar if search URL contains parameters.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3604,7 +3604,7 @@
    <date>2013-02-20</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
-* 
+* [jan] Fix searching from topbar if search URL contains parameters.
    </notes>
   </release>
  </changelog>

horde/templates/topbar/_menubar.html.php

@@ -10,6 +10,9 @@
 <?php if ($this->search): ?>
   <div id="horde-search">
     <form action="<?php echo $this->searchAction ?>" method="get">
+<?php foreach ($this->searchParameters as $name => $value): ?>
+      <input type="hidden" name="<?php echo $this->h($name) ?>" value="<?php echo $this->h($value) ?>" />
+<?php endforeach ?>
 <?php if ($this->searchMenu): ?>
       <div class="horde-fake-input">
         <span id="horde-search-dropdown">