Merged V2.2 to HEAD

8083: Merged V2.1 to V2.2
      8066: RM-31 and related issues (ACT-729)
      8068: Fix for AR-1997
   8084: Fixed script error on notify page of invite website user wizard
   8086: Merged V2.1 to V2.2
      8075: Clear()ing a hibernate session, is not always enough to guarantee that transactions not use unbounded amounts of memory
      8076: Turn off test that needs to be fixed real soon now.
   8092: Implementation for:   http://issues.alfresco.com/browse/AR-1744
   8093: Fixed upgrade scripts for V2.1.2 to V2.2 upgrades
   8096: Fix for AWC-1578 and AWC-1814
   8097: Added new indexes missing from scripts and made index names consistent.
   8098: Fix for AWC-1548
   8100: Removed use of QName from alf_permission table
   8102: Fix for AWC-1690
   8103: test was == on id that used to be long but is now a Long


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/BrowseBean.java

@@ -1391,7 +1391,13 @@ public class BrowseBean implements IContextListener, Serializable
    public void closeSearch(ActionEvent event)
    {
       // set the current node Id ready for page refresh
-      this.navigator.setCurrentNodeId( this.navigator.getCurrentNodeId() );
+      String currentNodeId = this.navigator.getCurrentNodeId();
+      this.navigator.setCurrentNodeId(currentNodeId);
+      
+      // setup dispatch context so we go back to the right place
+      NodeRef currentNodeRef = new NodeRef(Repository.getStoreRef(), currentNodeId);
+      Node currentNode = new Node(currentNodeRef);
+      this.navigator.setupDispatchContext(currentNode);
    }
 
    /**