From 92df41d55a1ee223e4cca53a01b0c49e6ffe767e Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sat, 3 Apr 2010 17:34:13 -0400 Subject: [PATCH] Fix delete link generation. Need to pass datetime and url parameters to getDeleteUrl() as well. Deleting the 'current' recurrence fails without the datetime parameter, and returning to the previous view after deletion fails without the url parameter. --- kronolith/lib/Event.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php index 0f303bee1..98a30dd9e 100644 --- a/kronolith/lib/Event.php +++ b/kronolith/lib/Event.php @@ -2465,7 +2465,9 @@ abstract class Kronolith_Event . ''; } if ($this->hasPermission(Horde_Perms::DELETE)) { - $link .= $this->getDeleteUrl() + $link .= $this->getDeleteUrl( + array('datetime' => $datetime->strftime('%Y%m%d%H%M%S'), + 'url' => $from_url)) ->link(array('title' => sprintf(_("Delete %s"), $event_title), 'class' => 'iconDelete')) . Horde::fullSrcImg('delete-' . $icon_color . '.png', -- 2.11.0