Merged in release/3.2.2 (pull request #6087)

Release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-10-02 14:39:20 +00:00
3 changed files with 7 additions and 4 deletions

View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\BusinessModel; namespace ProcessMaker\BusinessModel;
use ProcessMaker\Core\System; use ProcessMaker\Core\System;
use WebEntryPeer;
class WebEntry class WebEntry
{ {
@@ -1079,8 +1080,10 @@ class WebEntry
*/ */
public function isWebEntryOne($weUid) public function isWebEntryOne($weUid)
{ {
$webEntry = \WebEntryPeer::retrieveByPK($weUid); $webEntry = WebEntryPeer::retrieveByPK($weUid);
return $webEntry->getWeType()==='SINGLE' && $webEntry->getWeAuthentication()==='ANONYMOUS'; return $webEntry->getWeType() === 'SINGLE'
&& $webEntry->getWeAuthentication() === 'ANONYMOUS'
&& $webEntry->getWeCallback() === 'PROCESSMAKER';
} }
/** /**

View File

@@ -53,7 +53,7 @@ class WebEntryEvent
"WEE_TITLE" => array( "WEE_TITLE" => array(
"type" => "string", "type" => "string",
"required" => false, "required" => false,
"empty" => false, "empty" => true,
"defaultValues" => array(), "defaultValues" => array(),
"fieldNameAux" => "webEntryEventTitle" "fieldNameAux" => "webEntryEventTitle"
), ),

View File

@@ -105,7 +105,7 @@ class PluginRegistry
*/ */
public function registerPlugin($Namespace, $Filename = null) public function registerPlugin($Namespace, $Filename = null)
{ {
$ClassName = $Namespace . "plugin"; $ClassName = $Namespace . "Plugin";
$plugin = new $ClassName($Namespace, $Filename); $plugin = new $ClassName($Namespace, $Filename);
if (isset($this->_aPluginDetails[$Namespace])) { if (isset($this->_aPluginDetails[$Namespace])) {