hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +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

10
lib/classes/ACL.php
View File

@@ -234,7 +234,7 @@ class ACL implements cache_cacheableInterface
$subdef_class = $record->get_databox()->get_subdef_structure()
->get_subdef($record->get_type(), $subdef_name)
->get_class();
} catch (Exception $e) {
} catch (\Exception $e) {
return false;
}
@@ -741,7 +741,7 @@ class ACL implements cache_cacheableInterface
try {
$ret[$sbas_id] = $this->app['phraseanet.appbox']->get_databox((int) $sbas_id);
} catch (Exception $e) {
} catch (\Exception $e) {
}
}
@@ -792,7 +792,7 @@ class ACL implements cache_cacheableInterface
$this->_rights_records_document = $tmp_rights['document'];
return $this;
} catch (Exception $e) {
} catch (\Exception $e) {
}
$sql = 'SELECT sbas_id, record_id, preview, document
@@ -834,7 +834,7 @@ class ACL implements cache_cacheableInterface
$this->is_admin = $this->get_data_from_cache(self::CACHE_IS_ADMIN);
return $this;
} catch (Exception $e) {
} catch (\Exception $e) {
}
$sql = 'SELECT create_db
@@ -928,7 +928,7 @@ class ACL implements cache_cacheableInterface
$this->_limited = $this->get_data_from_cache(self::CACHE_LIMITS_BAS);
return $this;
} catch (Exception $e) {
} catch (\Exception $e) {
}