Merge branch '3.8'

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
60 changed files with 168 additions and 137 deletions

View File

@@ -208,7 +208,7 @@ class databox extends base
foreach ($this->get_available_collections() as $coll_id) {
try {
$ret[] = collection::get_from_coll_id($this->app, $this, $coll_id);
} catch (Exception $e) {
} catch (\Exception $e) {
}
}
@@ -220,7 +220,7 @@ class databox extends base
{
try {
return $this->get_data_from_cache(self::CACHE_COLLECTIONS);
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -533,7 +533,7 @@ class databox extends base
$stmt = $connection->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -650,7 +650,7 @@ class databox extends base
try {
$metaStructData = $this->get_data_from_cache(self::CACHE_META_STRUCT);
} catch (Exception $e) {
} catch (\Exception $e) {
$sql = 'SELECT id, name FROM metadatas_structure ORDER BY sorter ASC';
$stmt = $this->get_connection()->prepare($sql);
$stmt->execute();
@@ -958,7 +958,7 @@ class databox extends base
try {
$meta_struct_field->set_tag(\databox_field::loadClassFromTagName($src))->save();
} catch (Exception $e) {
} catch (\Exception $e) {
}
}
@@ -1003,7 +1003,7 @@ class databox extends base
if ( ! empty($row['logo'])) {
file_put_contents($this->app['root.path'] . '/config/minilogos/' . $base_id, $row['logo']);
}
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}
}
@@ -1134,7 +1134,7 @@ class databox extends base
$this->thesaurus = $this->get_data_from_cache(self::CACHE_THESAURUS);
return $this->thesaurus;
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}
@@ -1146,7 +1146,7 @@ class databox extends base
$stmt->closeCursor();
$this->thesaurus = $row['thesaurus'];
$this->set_data_to_cache($this->thesaurus, self::CACHE_THESAURUS);
} catch (Exception $e) {
} catch (\Exception $e) {
unset($e);
}
@@ -1171,7 +1171,7 @@ class databox extends base
{
try {
return $this->get_data_from_cache(self::CACHE_STRUCTURE);
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -1362,7 +1362,7 @@ class databox extends base
$this->cgus = $this->get_data_from_cache(self::CACHE_CGUS);
return $this;
} catch (Exception $e) {
} catch (\Exception $e) {
}