diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 88ed11b64..4b5b67692 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -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; diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php index e57da946d..0357234da 100644 --- a/e107_handlers/e_marketplace.php +++ b/e107_handlers/e_marketplace.php @@ -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')) {