hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Romain Neutron
2012-03-19 19:36:07 +01:00
parent 8f261f3e8e
commit a49157b7d6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Cache/Manager.php
View File

@@ -87,7 +87,7 @@ class Manager
if ($this->hasChange($cacheKey, $service_name)) if ($this->hasChange($cacheKey, $service_name))
{ {
$service->getDriver()->flush(); $service->getDriver()->flushAll();
if ($write) if ($write)
{ {
$this->registry[$cacheKey] = $service_name; $this->registry[$cacheKey] = $service_name;

12
lib/classes/task/manager.class.php
View File

@@ -78,13 +78,13 @@ class task_manager
$tasks = array(); $tasks = array();
$appbox = appbox::get_instance(); $appbox = \appbox::get_instance(\bootstrap::getCore());
$lockdir = $appbox->get_registry()->get('GV_RootPath') . 'tmp/locks/'; $lockdir = $appbox->get_registry()->get('GV_RootPath') . 'tmp/locks/';
foreach ($rs as $row) foreach ($rs as $row)
{ {
$row['pid'] = NULL; $row['pid'] = NULL;
$classname = $row['class']; $classname = $row['class'];
if (!class_exists($classname)) if (!class_exists($classname))
continue; continue;
@@ -164,7 +164,7 @@ class task_manager
return $row; return $row;
} }
public function get_scheduler_state2() public function get_scheduler_state2()
{ {
$pid = NULL; $pid = NULL;
@@ -184,13 +184,13 @@ class task_manager
} }
fclose($schedlock); fclose($schedlock);
} }
$sql = "SELECT UNIX_TIMESTAMP()-UNIX_TIMESTAMP(schedqtime) AS qdelay, schedstatus AS status FROM sitepreff"; $sql = "SELECT UNIX_TIMESTAMP()-UNIX_TIMESTAMP(schedqtime) AS qdelay, schedstatus AS status FROM sitepreff";
$stmt = $this->appbox->get_connection()->prepare($sql); $stmt = $this->appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$ret = $stmt->fetch(PDO::FETCH_ASSOC); $ret = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
if($pid === NULL && $ret['status'] !== 'stopped') if($pid === NULL && $ret['status'] !== 'stopped')
{ {
// auto fix // auto fix
@@ -200,7 +200,7 @@ class task_manager
$ret['pid'] = $pid; $ret['pid'] = $pid;
return($ret); return($ret);
} }
public static function getAvailableTasks() public static function getAvailableTasks()
{ {
$registry = registry::get_instance(); $registry = registry::get_instance();