Merge remote branch 'upstream/master' into BUG-10852

workflow/engine/methods/login/authentication.php

@@ -295,41 +295,6 @@ try {
         die;
     }
 
-    ///// VERIFY PLUGIN ENTERPRISE IF IS ENABLED AND PARTNER FLAG EXIST
-    $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
-    if ($partnerFlag) {
-        $flagEnableEnterprise = true;
-        G::loadClass('PMPluginRegistry');
-        $sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
-        $oPluginRegistry = & PMPluginRegistry::getSingleton();
-        if (file_exists( $sSerializedFile )) {
-            $oPluginRegistry->unSerializeInstance( file_get_contents( $sSerializedFile ) );
-            $attributes = $oPluginRegistry->getAttributes();
-            if ( isset($attributes['_aPluginDetails']['enterprise']) &&
-                 $attributes['_aPluginDetails']['enterprise']->enabled == 1
-                ) {
-                $flagEnableEnterprise = false;
-            }
-        }
-
-        if ($flagEnableEnterprise) {
-            $pluginFile = 'enterprise.php';
-            require_once (PATH_PLUGINS . $pluginFile);
-            $details = $oPluginRegistry->getPluginDetails( $pluginFile );
-            @$oPluginRegistry->enablePlugin( $details->sNamespace );
-            @$oPluginRegistry->setupPlugins();
-
-            $language = new Language();
-            $pathPluginTranslations = PATH_PLUGINS . 'enterprise' . PATH_SEP . 'translations' . PATH_SEP;
-            if (file_exists($pathPluginTranslations . 'translations.php')) {
-                if (!file_exists($pathPluginTranslations . 'enterprise' . '.' . SYS_LANG . '.po')) {
-                    @$language->createLanguagePlugin('enterprise', SYS_LANG);
-                }
-                @$language->updateLanguagePlugin('enterprise', SYS_LANG);
-            }
-        }
-    }
-
     $oHeadPublisher = &headPublisher::getSingleton();
     $oHeadPublisher->extJsInit = true;
 

workflow/engine/templates/setup/systemInfo.js

@@ -77,7 +77,7 @@ systemInfo.application = {
             width: 250,
             height: 300,
 
-            html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION")
+            html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") + _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2")
         });
 
         var frmfsCenter = new Ext.form.FieldSet({
@@ -89,7 +89,7 @@ systemInfo.application = {
             border: false,
             labelWidth: 200,
             width: 430,
-            height: 320,
+            height: 350,
             items: [
                 {
                     xtype: "displayfield",