backport to 4.6 for CRM-21123

diff --git a/CRM/Admin/Page/MessageTemplates.php b/CRM/Admin/Page/MessageTemplates.php
index af46d173f445b9937dbc3828430a04149c1d1e6e..87ee16bbb68195d5b8337cfa63b8ca7cc41bc0fd 100644 (file)
--- a/CRM/Admin/Page/MessageTemplates.php
+++ b/CRM/Admin/Page/MessageTemplates.php
@@ -202,7 +202,11 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
       CRM_Core_BAO_MessageTemplate::revert($id);
     }
 
-    $this->assign('selectedChild', CRM_Utils_Request::retrieve('selectedChild', 'String', $this));
+    $selectedChild = CRM_Utils_Request::retrieve('selectedChild', 'String', $this);
+
+    if (in_array($selectedChild, array('user', 'workflow'))) {
+      $this->assign('selectedChild', $selectedChild);
+    }
 
     return parent::run($args, $pageArgs, $sort);
   }