-- CRM-12941 handled for the point " If the onPopupClose is unspecified or is...

-- CRM-12941 handled for the point " If the onPopupClose is unspecified or is "redirectToProfile", then use the normal/old redirect URL"

----------------------------------------
* CRM-12941: Redirect to proper contact tab after saving profile
  http://issues.civicrm.org/jira/browse/CRM-12941

CRM/Profile/Form/Edit.php

@@ -214,9 +214,10 @@ SELECT module
 
         //passing the post url to template so the popup form does
         //proper redirection and proccess form errors if any
-        $popupRedirect = CRM_Utils_System::url('civicrm/profile/edit', $urlParams, FALSE, NULL, FALSE);
-
-        if ($this->_onPopupClose == 'redirectToTab') {
+        if (!isset($this->_onPopupClose) || $this->_onPopupClose == 'redirectToProfile') {
+          $popupRedirect = CRM_Utils_System::url('civicrm/profile/edit', $urlParams, FALSE, NULL, FALSE);
+        }
+        elseif ($this->_onPopupClose == 'redirectToTab') {
           $popupRedirect = CRM_Utils_System::url('civicrm/contact/view', 
             "reset=1&cid={$this->_id}&selectedChild=custom_{$this->_customGroupId}", FALSE, NULL, FALSE);
         }