hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 10:34:34 +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/Bridge/Account.php
View File

@@ -328,7 +328,7 @@ class Bridge_Account
if ( ! isset($apis[$api_id])) {
try {
$apis[$api_id] = new Bridge_Api($app, $api_id);
} catch (Exception $e) {
} catch (\Exception $e) {
continue;
}
}

4
lib/classes/Bridge/Api.php
View File

@@ -430,7 +430,7 @@ class Bridge_Api
$ret = $action($this);
return $ret;
} catch (Exception $e) {
} catch (\Exception $e) {
$this->get_connector()->handle_Exception($e);
if ($e instanceof Bridge_Exception_ActionAuthNeedReconnect) {
@@ -524,7 +524,7 @@ class Bridge_Api
foreach ($rs as $row) {
try {
$results[] = new Bridge_Api($app, $row['id']);
} catch (Exception $e) {
} catch (\Exception $e) {
}
}

2
lib/classes/Bridge/Api/Flickr.php
View File

@@ -457,7 +457,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
$this->get_element_from_id($ticket["dist_id"], $element->get_type());
$element->set_dist_id($ticket["dist_id"]);
}
} catch (Exception $e) {
} catch (\Exception $e) {
return self::UPLOAD_STATE_FAILED;
}

2
lib/classes/Bridge/Element.php
View File

@@ -295,7 +295,7 @@ class Bridge_Element
if (! $this->connector_element) {
try {
$this->connector_element = $this->account->get_api()->get_element_from_id($this->dist_id, $this->type);
} catch (Exception $e) {
} catch (\Exception $e) {
return null;
}
}