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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2012-09-13 12:31:20 +02:00
parent f1df64d512 c2a78c9d19
commit 4bb1a1d870
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/module/console/taskrun.class.php
View File

@@ -87,14 +87,14 @@ class module_console_taskrun extends Command
if ($input->getOption('runner') === task_abstract::RUNNER_MANUAL) { if ($input->getOption('runner') === task_abstract::RUNNER_MANUAL) {
$schedStatus = $task_manager->getSchedulerState(); $schedStatus = $task_manager->getSchedulerState();
if ($schedStatus && $schedStatus['status'] == 'running' && $schedStatus['pid']) { if ($schedStatus && $schedStatus['status'] == task_abstract::STATE_STARTED && $schedStatus['pid']) {
$this->shedulerPID = $schedStatus['pid']; $this->shedulerPID = $schedStatus['pid'];
} }
$runner = task_abstract::RUNNER_MANUAL; $runner = task_abstract::RUNNER_MANUAL;
} else { } else {
$runner = task_abstract::RUNNER_SCHEDULER; $runner = task_abstract::RUNNER_SCHEDULER;
$schedStatus = $task_manager->getSchedulerState(); $schedStatus = $task_manager->getSchedulerState();
if ($schedStatus && $schedStatus['status'] == 'running' && $schedStatus['pid']) { if ($schedStatus && $schedStatus['status'] == task_abstract::STATE_STARTED && $schedStatus['pid']) {
$this->shedulerPID = $schedStatus['pid']; $this->shedulerPID = $schedStatus['pid'];
} }
} }

8
lib/classes/task/period/archive.class.php
View File

@@ -1780,7 +1780,7 @@ class task_period_archive extends task_abstract
* @param array $nodesToDel out, filled with files to delete * @param array $nodesToDel out, filled with files to delete
* @param integer $grp_rid * @param integer $grp_rid
*/ */
private function archiveFile(\DOMDocument $dom, \DOMDocument $node, $path, $path_archived, $path_error, array &$nodesToDel, $grp_rid = 0) private function archiveFile(\DOMDocument $dom, \DOMElement $node, $path, $path_archived, $path_error, array &$nodesToDel, $grp_rid = 0)
{ {
$match = $node->getAttribute('match'); $match = $node->getAttribute('match');
@@ -1837,7 +1837,7 @@ class task_period_archive extends task_abstract
* @param integer $grp_rid * @param integer $grp_rid
* @param array $nodesToDel out, filled with files to delete * @param array $nodesToDel out, filled with files to delete
*/ */
private function archiveFileAndCaption(\DOMDOcument$dom, \DOMElement$node, \DOMElement$captionFileNode, $path, $path_archived, $path_error, $grp_rid, array &$nodesToDel) private function archiveFileAndCaption(\DOMDOcument$dom, \DOMElement $node, \DOMElement $captionFileNode = null, $path, $path_archived, $path_error, $grp_rid, array &$nodesToDel)
{ {
$ret = false; $ret = false;
@@ -1914,7 +1914,7 @@ class task_period_archive extends task_abstract
$this->log($e->getMessage()); $this->log($e->getMessage());
} }
if ($captionFileName != $file) { if ($captionFileName != $file && $captionFileName) {
$this->log(sprintf(('copy \'%s\' to \'archived\''), $subpath . '/' . $captionFileName)); $this->log(sprintf(('copy \'%s\' to \'archived\''), $subpath . '/' . $captionFileName));
try { try {
@@ -1942,7 +1942,7 @@ class task_period_archive extends task_abstract
$this->log($e->getMessage()); $this->log($e->getMessage());
} }
if ($captionFileName != $file) { if ($captionFileName != $file && $captionFileName) {
$this->log(sprintf(('copy \'%s\' to \'error\''), $subpath . '/' . $captionFileName)); $this->log(sprintf(('copy \'%s\' to \'error\''), $subpath . '/' . $captionFileName));
try { try {