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

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-11 11:29:01 +01:00
parent f7a669c07d de7931f7e2
commit 8a9b93c1ff
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/record/adapter.class.php
View File

@@ -1145,8 +1145,11 @@ class record_adapter implements record_Interface, cache_cacheableInterface
try
{
$appbox = \appbox::get_instance();
$session = $appbox->get_session();
$connbas = connection::getPDOConnection($this->get_sbas_id());
$sql = 'DELETE FROM subdef WHERE record_id= :record_id AND name=:name';
$stmt = $connbas->prepare($sql);
$stmt->execute(
@@ -1165,7 +1168,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface
(:record_id, :name, :baseurl, :filename,
:width, :height, :mime, :path, :filesize, "1")';
echo "substitute subdef $name with $base_url ".$system_file->getPath()." ".$system_file->getFilename()."<br>";
$stmt = $connbas->prepare($sql);
$stmt->execute(array(
@@ -1183,11 +1185,10 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$sql = 'UPDATE record SET moddate=NOW() WHERE record_id=:record_id';
$stmt = $connbas->prepare($sql);
$stmt->execute(array(':record_id' => $this->get_record_id()));
$stmt->execute();
$stmt->closeCursor();
$this->delete_data_from_cache(self::CACHE_SUBDEFS);
if ($meta_writable)
{
$this->write_metas();
@@ -1199,15 +1200,14 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$type = $name == 'document' ? 'HD' : $name;
$session->get_logger($record->get_databox())
->log($record, Session_Logger::EVENT_SUBSTITUTE, $type, '');
$session->get_logger($this->get_databox())
->log($this, Session_Logger::EVENT_SUBSTITUTE, $type, '');
}
catch (Exception $e)
{
unset($e);
}
return $this;
}