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

2
lib/classes/module/report/add.php
View File

@@ -80,7 +80,7 @@ class module_report_add extends module_report
try {
$user = User_Adapter::getInstance($value, $this->app);
$caption = $user->get_display_name();
} catch (Exception $e) {
} catch (\Exception $e) {
}
} elseif ($field == 'date')

2
lib/classes/module/report/dashboard.php
View File

@@ -328,7 +328,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf
$this->app, $sbasid, $coll, $this->dmin, $this->dmax
);
}
} catch (Exception $e) {
} catch (\Exception $e) {
}
$i ++;

2
lib/classes/module/report/dashboard/feed.php
View File

@@ -76,7 +76,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$result->setApplication($app);
return $result;
} catch (Exception $e) {
} catch (\Exception $e) {
}

2
lib/classes/module/report/download.php
View File

@@ -113,7 +113,7 @@ class module_report_download extends module_report
if (array_key_exists('record_id', $row)) {
try {
$record = new \record_adapter($app, $this->sbas_id, $row['record_id']);
} catch (Exception_Record_AdapterNotFound $e) {
} catch (\Exception_Record_AdapterNotFound $e) {
continue;
}

2
lib/classes/module/report/edit.php
View File

@@ -80,7 +80,7 @@ class module_report_edit extends module_report
try {
$user = User_Adapter::getInstance($value, $this->app);
$caption = $user->get_display_name();
} catch (Exception $e) {
} catch (\Exception $e) {
}
} elseif ($field == 'date') {

2
lib/classes/module/report/nav.php
View File

@@ -496,7 +496,7 @@ class module_report_nav extends module_report
try {
$record = new record_adapter($this->app, $sbas_id, $rid);
} catch (Exception_Record_AdapterNotFound $e) {
} catch (\Exception_Record_AdapterNotFound $e) {
return $this->report;
}

2
lib/classes/module/report/push.php
View File

@@ -81,7 +81,7 @@ class module_report_push extends module_report
try {
$user = User_Adapter::getInstance($value, $this->app);
$caption = $user->get_display_name();
} catch (Exception $e) {
} catch (\Exception $e) {
}
} elseif ($field == 'date') {

2
lib/classes/module/report/sent.php
View File

@@ -81,7 +81,7 @@ class module_report_sent extends module_report
try {
$user = User_Adapter::getInstance($value, $this->app);
$caption = $user->get_display_name();
} catch (Exception $e) {
} catch (\Exception $e) {
}
} elseif ($field == 'date') {

2
lib/classes/module/report/validate.php
View File

@@ -81,7 +81,7 @@ class module_report_validate extends module_report
try {
$user = User_Adapter::getInstance($value, $this->app);
$caption = $user->get_display_name();
} catch (Exception $e) {
} catch (\Exception $e) {
}
} elseif ($field == 'date') {