Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/dialog/DialogManager.java

@@ -71,14 +71,14 @@ public final class DialogManager
                "' does not implement the required IDialogBean interface");
       }
       
+      // create the DialogState object
+      this.currentDialogState = new DialogState(config, dialog);
+      
       // initialise the managed bean
       dialog.init(this.paramsToApply);
       
       // reset the current parameters so subsequent dialogs don't get them
       this.paramsToApply = null;
-      
-      // create the DialogState object
-      this.currentDialogState = new DialogState(config, dialog);
    }
    
    /**