Merge remote branch 'upstream/master'

workflow/engine/classes/class.system.php

@@ -956,6 +956,11 @@ class System
                 $folderId = 'classic';
             }
 
+            $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
+            if ($partnerFlag && ($folderId == 'classic')){
+                continue;
+            }
+
             $xmlConfiguration = file_get_contents( $configInformation );
             $xmlConfigurationObj = G::xmlParser( $xmlConfiguration );
 

workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js

@@ -555,6 +555,10 @@ var Conditional = function(DYN_UID){
     }
 
     this.saveCondition = function(){
+    	if (!sessionPersits()) {
+    	    showPrompt('conditionalShowHide');
+    	    return;
+    	}
         var oTmp;
         this.canSave = true;
         oUID = getField('FCD_UID');