Merge branch 'hotfix/3.7.4'

This commit is contained in:
yuri
2015-10-22 11:35:50 +03:00
5 changed files with 10 additions and 9 deletions
+4 -1
View File
@@ -55,7 +55,10 @@ class Auth extends \Slim\Middleware
}
$espoCgiAuth = $req->headers('HTTP_ESPO_CGI_AUTH');
if ( !isset($authUsername) && !isset($authPassword) && !empty($espoCgiAuth) ) {
if (empty($espoCgiAuth)) {
$espoCgiAuth = $req->headers('REDIRECT_HTTP_ESPO_CGI_AUTH');
}
if (!isset($authUsername) && !isset($authPassword) && !empty($espoCgiAuth)) {
list($authUsername, $authPassword) = explode(':' , base64_decode(substr($espoCgiAuth, 6)));
}
@@ -86,11 +86,8 @@ class Unsubscribe extends \Espo\Core\EntryPoints\Base
$link = $m[$target->getEntityType()];
}
if ($link) {
if ($campaign) {
$targetListList = $campaign->get('targetLists');
} else {
$targetListList = $massEmail->get('targetLists');
}
$targetListList = $massEmail->get('targetLists');
foreach ($targetListList as $targetList) {
$this->getEntityManager()->getRepository('TargetList')->updateRelation($targetList, $link, $target->id, array(
'optedOut' => true
@@ -238,7 +238,8 @@
},
"collection": {
"sortBy": "name",
"asc": true
"asc": true,
"textFilterFields": ["name", "emailAddress"]
},
"indexes": {
"firstName": {
@@ -255,7 +255,7 @@
"collection": {
"sortBy": "createdAt",
"asc": false,
"textFilterFields": ["name", "accountName"]
"textFilterFields": ["name", "accountName", "emailAddress"]
},
"indexes": {
"firstName": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "3.7.3",
"version": "3.7.4",
"description": "",
"main": "index.php",
"repository": {