Keep open section on saving contacts too (Request #12609).

turba/docs/CHANGES

@@ -2,8 +2,8 @@
 v4.2.0-git
 ----------
 
-[jan] Remember currently open tab when switching between contact viewing and
-      editing (Request #12609).
+[jan] Remember currently open tab when switching or saving contact views
+      (Request #12609).
 [jan] Replace categories with tags (Request #9544).
 
 

turba/edit.php

@@ -79,7 +79,9 @@
     $url = isset($vars->url)
         ? new Horde_Url($url, true)
         : $contact->url('Contact', true);
-    $url->unique()->redirect();
+    $url->add('section', $form->getOpenSection())
+        ->unique()
+        ->redirect();
 } catch (Turba_Exception $e) {}
 
 $title = sprintf($contact->isGroup() ? _("Edit Group \"%s\"") : _("Edit \"%s\""), $contact->getValue('name'));

turba/lib/View/Contact.php

@@ -40,6 +40,7 @@ public function html($active = true)
 
         $vars = new Horde_Variables();
         $form = new Turba_Form_Contact($vars, $this->contact);
+        $form->setOpenSection(Horde_Util::getFormData('section'));
 
         /* Get the contact's history. */
         $history = $this->contact->getHistory();

turba/package.xml

@@ -40,16 +40,8 @@
  </stability>
  <license uri="http://www.horde.org/licenses/asl">ASL</license>
  <notes>
-<<<<<<< HEAD
-* [jan] Remember currently open tab when switching between contact viewing and editing (Request #12609).
+* [jan] Remember currently open tab when switching or saving contact views (Request #12609).
 * [jan] Replace categories with tags (Request #9544).
-=======
-* [jan] Fix exporting selected contacts (Bug #12759).
-* [mms] Improved UI when viewing search results from Advanced Search.
-* [mms] Remove features from UI when VFS is not available or disabled.
-* [mjr] Fix filtering Facebook driver results (Bug #12739).
-* [jan] Gracefully deal with columns removed from the backend.
->>>>>>> master
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">