We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 1f87e777 authored by Zach Copley's avatar Zach Copley

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  include q as param, not arg for search sub menu
  exact match for paths
  change category on urlmapper.php
parents 5eb6c0d7 0b1d8762
......@@ -20,7 +20,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Cache
* @category URL
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
......@@ -212,7 +212,7 @@ class URLMapper
array($pr, 'toPattern'),
$path);
$regex = '#' . str_replace('#', '\#', $regex) . '#';
$regex = '#^' . str_replace('#', '\#', $regex) . '$#';
return $regex;
}
......
......@@ -85,4 +85,23 @@ class SearchSubMenu extends MoreMenu
return $items;
}
function item($actionName, $args, $label, $description, $id=null, $cls=null)
{
if (empty($id)) {
$id = $this->menuItemID($actionName, $args);
}
// Add 'q' as a search param, not part of the url path
$url = common_local_url($actionName, array(), $args);
$this->out->menuItem($url,
$label,
$description,
$this->isCurrent($actionName, $args),
$id,
$cls);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment