From: Jan Schneider Date: Tue, 24 Aug 2010 21:09:20 +0000 (+0200) Subject: Fix Horde_Menu now expecting Horde_Urls. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6ec290a548b91e58f1254cff35c7f34dc7f176bd;p=horde.git Fix Horde_Menu now expecting Horde_Urls. --- diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index a5edc38de..f3b882cc0 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -2961,7 +2961,7 @@ class Kronolith 'KronolithGoto.weekurl = ' . Horde_Serialize::serialize(strval(Horde::applicationUrl('week.php')), Horde_Serialize::JSON, $registry->getCharset()), 'KronolithGoto.yearurl = ' . Horde_Serialize::serialize(strval(Horde::applicationUrl('year.php')), Horde_Serialize::JSON, $registry->getCharset()), )); - $menu->add('#', _("_Goto"), 'goto.png', null, '', null, 'kgotomenu'); + $menu->add(new Horde_Url(''), _("_Goto"), 'goto.png', null, '', null, 'kgotomenu'); } $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php index 0288052bf..f15f34dc0 100644 --- a/nag/lib/Nag.php +++ b/nag/lib/Nag.php @@ -767,9 +767,9 @@ class Nag (!empty($conf['hooks']['permsdenied']) || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_tasks') === true || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_tasks') > Nag::countTasks())) { - $menu->add(Horde::applicationUrl(Horde_Util::addParameter('task.php', 'actionID', 'add_task')), _("_New Task"), 'add.png', null, null, null, Horde_Util::getFormData('task') ? '__noselection' : null); + $menu->add(Horde::applicationUrl('task.php')->add('actionID', 'add_task'), _("_New Task"), 'add.png', null, null, null, Horde_Util::getFormData('task') ? '__noselection' : null); if ($GLOBALS['browser']->hasFeature('dom')) { - $menu->add('', _("_Quick Add"), 'add.png', null, null, 'Nag.quickAddPanel.show(); $(\'quickText\').focus(); return false;', Horde_Util::getFormData('task') ? 'quickAdd __noselection' : 'quickAdd'); + $menu->add(new Horde_Url(''), _("_Quick Add"), 'add.png', null, null, 'Nag.quickAddPanel.show(); $(\'quickText\').focus(); return false;', Horde_Util::getFormData('task') ? 'quickAdd __noselection' : 'quickAdd'); } }