Merge remote branch 'upstream/master'

2013-05-03 14:48:14 -04:00
parent 59f14ee656 f69b0869d8
commit dd70f55e5b
1 changed files with 5 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 );