From 9bf765fab6b18b4c051c047f2f63d62e5fd6c7ee Mon Sep 17 00:00:00 2001
From: Michael J Rubinsky <mrubinsk@horde.org>
Date: Tue, 1 Jul 2014 13:52:30 -0400
Subject: [PATCH] Proper fix for Bug: 13308

---
 nag/app/controllers/SaveTask.php  | 3 ++-
 nag/task.php                      | 3 +++
 nag/templates/list.html.php       | 3 +--
 nag/templates/list/_task.html.php | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nag/app/controllers/SaveTask.php b/nag/app/controllers/SaveTask.php
index f06c0c615c2..96b09b1b0f7 100644
--- a/nag/app/controllers/SaveTask.php
+++ b/nag/app/controllers/SaveTask.php
@@ -102,7 +102,8 @@ public function processRequest(Horde_Controller_Request $request, Horde_Controll
                 'tasklist_id' => $info['tasklist_id'],
                 'parent' => $info['parent']));
         } else {
-            $url = Horde_Util::getFormData('url', Horde::url('list.php', true));
+            $url = Horde_Util::getFormData('url', (string)Horde::url('list.php', true));
+            $url = Horde::url($url, true);
         }
 
         $response->setRedirectUrl($url);
diff --git a/nag/task.php b/nag/task.php
index 42d6fe60e60..04e3b0d35bc 100644
--- a/nag/task.php
+++ b/nag/task.php
@@ -106,6 +106,9 @@ function _delete($task_id, $tasklist_id)
             $vars = new Horde_Variables($h);
             $vars->set('old_tasklist', $task->tasklist);
             $vars->set('url', Horde_Util::getFormData('url'));
+            if ($u = Horde_Util::getFormData('url')) {
+                $vars->set('url', $u);
+            }
             $form = new Nag_Form_Task($vars, sprintf(_("Edit: %s"), $task->name));
             break;
         }
diff --git a/nag/templates/list.html.php b/nag/templates/list.html.php
index c8e680c1c66..084233e4c5a 100644
--- a/nag/templates/list.html.php
+++ b/nag/templates/list.html.php
@@ -63,8 +63,7 @@ function doPrefsUpdate(column, sortDown)
               'due' => $due,
               'columns' => $this->columns,
               'dynamic_sort' => $this->dynamic_sort &= !$task->hasSubTasks(),
-              'dateFormat' => $GLOBALS['prefs']->getValue('date_format'),
-              'haveSearch' => $this->haveSearch); ?>
+              'dateFormat' => $GLOBALS['prefs']->getValue('date_format')); ?>
             <?php echo $this->renderPartial('list/task', array('locals' => $locals)) ?>
         <?php endwhile; ?>
       </tbody>
diff --git a/nag/templates/list/_task.html.php b/nag/templates/list/_task.html.php
index a64d6e7999c..69626cba1a7 100644
--- a/nag/templates/list/_task.html.php
+++ b/nag/templates/list/_task.html.php
@@ -35,7 +35,8 @@
     if ($have_edit &&
         (!$task->private || $task->owner == $GLOBALS['registry']->getAuth())) {
         $label = sprintf(_("Edit \"%s\""), $task->name);
-        echo Horde::link($task->edit_link->add('have_search', $this->haveSearch), $label) . Horde::img('edit.png', $label) . '</a>';
+        $params = array('have_search' => $this->haveSearch, 'url' => Horde::selfUrl(true));
+        echo Horde::link($task->edit_link->add($params), $label) . Horde::img('edit.png', $label) . '</a>';
     }
     ?>
   </td>