hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2175-subdef-building-duration

Browse Source
This commit is contained in:
aina-esokia
2018-08-09 15:45:27 +04:00
parent 1181f7da01 84f917f0ce
commit ddd0695c99
20 changed files with 2397 additions and 4391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/TaskManager/Notifier.php
View File

@@ -25,7 +25,7 @@ class Notifier implements NotifierInterface
private $logger;
/** @var integer */
private $timeout = 2;
private $timeout = 10;
public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
{

8
lib/classes/User/Query.php
View File

@@ -839,19 +839,19 @@ class User_Query
}
if ($this->activities) {
$sql .= $this->generate_field_constraints('activite', $this->activities);
$sql .= $this->generate_field_constraints('activity', $this->activities);
}
if ($this->positions) {
$sql .= $this->generate_field_constraints('fonction', $this->positions);
$sql .= $this->generate_field_constraints('job', $this->positions);
}
if ($this->countries) {
$sql .= $this->generate_field_constraints('pays', $this->countries);
$sql .= $this->generate_field_constraints('country', $this->countries);
}
if ($this->companies) {
$sql .= $this->generate_field_constraints('societe', $this->companies);
$sql .= $this->generate_field_constraints('company', $this->companies);
}
if ($this->templates) {