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

Remove phraseanet services, update configuration

Browse Source
This commit is contained in:
Romain Neutron
2013-06-11 11:57:43 +02:00
parent 8ecc97e94e
commit 32c2d6154a
99 changed files with 1545 additions and 5049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/record/adapter.php
View File

@@ -1945,7 +1945,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
ORDER BY g.ord ASC, dateadd ASC, record_id ASC';
$params = array(
':GV_site' => $this->app['phraseanet.registry']->get('GV_sit'),
':GV_site' => $this->app['phraseanet.configuration']['main']['key'],
':usr_id' => $this->app['authentication']->getUser()->get_id(),
':record_id' => $this->get_record_id(),
);
@@ -1996,7 +1996,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
WHERE rid_child = :record_id';
$params = array(
':GV_site' => $this->app['phraseanet.registry']->get('GV_sit')
':GV_site' => $this->app['phraseanet.configuration']['main']['key']
, ':usr_id' => $this->app['authentication']->getUser()->get_id()
, ':record_id' => $this->get_record_id()
);

6
lib/classes/record/preview.php
View File

@@ -336,7 +336,7 @@ class record_preview extends record_adapter
if (! $report) {
$sql .= ' AND ((l.usrid = :usr_id AND l.site= :site) OR action="add")';
$params[':usr_id'] = $this->app['authentication']->getUser()->get_id();
$params[':site'] = $this->app['phraseanet.registry']->get('GV_sit');
$params[':site'] = $this->app['phraseanet.configuration']['main']['key'];
}
$sql .= 'ORDER BY d.date, usrid DESC';
@@ -441,7 +441,7 @@ class record_preview extends record_adapter
$stmt->execute(
array(
':record_id' => $this->get_record_id(),
':site' => $this->app['phraseanet.registry']->get('GV_sit')
':site' => $this->app['phraseanet.configuration']['main']['key']
)
);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -604,7 +604,7 @@ class record_preview extends record_adapter
$stmt->execute(
array(
':record_id' => $this->get_record_id(),
':site' => $this->app['phraseanet.registry']->get('GV_sit')
':site' => $this->app['phraseanet.configuration']['main']['key']
)
);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);