Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #1632 from mailpoet/premium-plugin-api-fix

Browse Source 
Add fallback for API endpoint instantiation [MAILPOET-1639]
This commit is contained in:
M. Shull
2018-11-15 12:30:37 -05:00
committed by GitHub
parent 3af3c46fde 528f223a70
commit c3891f36cd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/API/JSON/API.php
View File

@ -3,6 +3,7 @@ namespace MailPoet\API\JSON;
use MailPoet\Config\AccessControl;
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
use MailPoet\Models\Setting;
use MailPoet\Util\Helpers;
use MailPoet\Util\Security;
@ -142,7 +143,12 @@ class API {
throw new \Exception(__('Invalid API endpoint.', 'mailpoet'));
}
$endpoint = $this->container->get($this->_request_endpoint_class);
try {
$endpoint = $this->container->get($this->_request_endpoint_class);
} catch (ServiceNotFoundException $e) {
// Hotfix for Premium plugin which adds endpoints which are not registered in DI container
$endpoint = new $this->_request_endpoint_class();
}
if(!method_exists($endpoint, $this->_request_method)) {
throw new \Exception(__('Invalid API endpoint method.', 'mailpoet'));