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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
This commit is contained in:
Romain Neutron
2014-02-20 16:05:23 +01:00
parent 405dbb7533 53c7af3dbb
commit 12f9575a8b
60 changed files with 168 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$this->base_id = $datas['base_id'];
return $this;
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -513,7 +513,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
try {
return $this->get_subdef('thumbnailGIF');
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -559,7 +559,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
{
try {
return $this->get_data_from_cache(self::CACHE_STATUS);
} catch (Exception $e) {
} catch (\Exception $e) {
}
$sql = 'SELECT BIN(status) as status FROM record
@@ -705,7 +705,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
{
try {
return $this->get_data_from_cache(self::CACHE_SUBDEFS);
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -750,7 +750,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
if (!$this->technical_datas) {
try {
$this->technical_datas = $this->get_data_from_cache(self::CACHE_TECHNICAL_DATAS);
} catch (Exception $e) {
} catch (\Exception $e) {
$this->technical_datas = [];
$connbas = $this->get_databox()->get_connection();
$sql = 'SELECT name, value FROM technical_datas WHERE record_id = :record_id';
@@ -935,7 +935,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$this->get_subdef('preview');
return $this->get_subdef('preview')->is_physically_present();
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}
@@ -1203,7 +1203,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
':coll_id' => $collection->get_coll_id()
]);
$stmt->closeCursor();
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}
@@ -1258,7 +1258,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
':coll_id' => $file->getCollection()->get_coll_id()
]);
$stmt->closeCursor();
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}

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

@@ -370,7 +370,7 @@ class record_preview extends record_adapter
try {
$user = \User_Adapter::getInstance($row['usr_id'], $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
}