mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

#1977 - Catch error with e_marketplace

Browse Source
This commit is contained in:
Cameron
2016-10-31 16:15:49 -07:00
parent a44f218752
commit 7041f9b6a8
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/cpage.php
View File

@@ -584,6 +584,9 @@ class page_admin_ui extends e_admin_ui
### Parse aliases again or all filters shall fail due to the menu hack!
$this->_alias_parsed = false;
$this->parseAliases();
@@ -709,7 +712,7 @@ class page_admin_ui extends e_admin_ui
$sef = e107::getParser()->toDB($newdata['page_sef']);
if(isset($newdata['page_title']) && isset($newdata['page_title']) && empty($newdata['page_title']) && empty($newdata['menu_name']))
if(isset($newdata['page_title']) && isset($newdata['menu_name']) && empty($newdata['page_title']) && empty($newdata['menu_name']))
{
e107::getMessage()->addError(CUSLAN_79);
return false;

13
e107_handlers/e_marketplace.php
View File

@@ -503,7 +503,18 @@ class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract
'connection_timeout' => 60,
);
$this->client = new SoapClient($this->serviceUrl, $options);
try
{
$this->client = new SoapClient($this->serviceUrl, $options);
}
catch (Exception $e)
{
e107::getMessage()->addError("Unable to connect. Please check firewall and/or internet connection.");
e107::getMessage()->addDebug($e->getMessage());
}
if(function_exists('xdebug_disable'))
{