Merge remote branch 'upstream/master'

2013-05-06 13:50:58 +00:00
parent ed9d0cf3c7 9bdaf7b2e9
commit 8e60b5930b
2 changed files with 9 additions and 0 deletions
--- a/workflow/engine/classes/class.system.php
+++ b/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 );