hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 20:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
This commit is contained in:
Romain Neutron
2013-10-18 15:01:47 +02:00
parent c28019adb4 a0aa9cc97f
commit 0fa375b9bc
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/task/Scheduler.php
View File

@@ -372,7 +372,14 @@ class task_Scheduler
); );
if (is_resource($taskPoll[$tkey]["process"])) { if (is_resource($taskPoll[$tkey]["process"])) {
$this->sleep(2); // let the process lock and write it's pid
$sleepTimeout = microtime(true) + 10;
do {
usleep(500000);
if (null !== $taskPoll[$tkey]['task']->getPID()) {
break;
}
} while (microtime(true) < $sleepTimeout);
} }
if (is_resource($taskPoll[$tkey]["process"]) && ($pid = $taskPoll[$tkey]['task']->getPID()) !== null) { if (is_resource($taskPoll[$tkey]["process"]) && ($pid = $taskPoll[$tkey]['task']->getPID()) !== null) {

2
templates/web/client/index.html.twig
View File

@@ -309,7 +309,7 @@
<div class="basGrp"> <div class="basGrp">
{% for collId, collection in storage_access['collections'] %} {% for collId, collection in storage_access['collections'] %}
<div> <div>
<input type="checkbox" class="checkbox basItem basItem{{ sbasId }}" checked name="bas[]" id="basChk{{ collId}}" value="{{ collId }}"> <input type="checkbox" class="checkbox basItem basItem{{ sbasId }}" checked name="bases[]" id="basChk{{ collId}}" value="{{ collId }}">
<label for="basChk{{ collId }}">{{ collection.get_name() }}</label> <label for="basChk{{ collId }}">{{ collection.get_name() }}</label>
</div> </div>
{% endfor %} {% endfor %}

4
templates/web/login/include/cooliris-content.html.twig
View File

@@ -1,5 +1,5 @@
<div class="row-fluid"> <div class="row-fluid">
<!--[if gte IE 7]> <!--[if !IE 6]><!-->
<div class="span12" style="height:400px;"> <div class="span12" style="height:400px;">
<object id="o" width="100%" height="100%" <object id="o" width="100%" height="100%"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
@@ -21,5 +21,5 @@
</embed> </embed>
</object> </object>
</div> </div>
<![endif]--> <!--<![endif]-->
</div> </div>