@@ -185,7 +185,8 @@ |
||
| 185 | 185 | |
| 186 | 186 | try { |
| 187 | 187 | $account = new midcom_core_account($person); |
| 188 | - } catch (midcom_error) { |
|
| 188 | + } |
|
| 189 | + catch (midcom_error) { |
|
| 189 | 190 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error'); |
| 190 | 191 | return; |
| 191 | 192 | } |
@@ -90,7 +90,8 @@ |
||
| 90 | 90 | if ($request->request->has('midcom_helper_datamanager2_save')) { |
| 91 | 91 | try { |
| 92 | 92 | $rules = $this->_load_rules($request); |
| 93 | - } catch (midcom_error $e) { |
|
| 93 | + } |
|
| 94 | + catch (midcom_error $e) { |
|
| 94 | 95 | midcom::get()->uimessages->add($this->_component, $this->_l10n->get($e->getMessage()), 'error'); |
| 95 | 96 | return; |
| 96 | 97 | } |
@@ -82,7 +82,8 @@ discard block |
||
| 82 | 82 | try { |
| 83 | 83 | $object1 = $this->load($param->parentguid); |
| 84 | 84 | $object2 = $this->load($param->name); |
| 85 | - } catch (midcom_error) { |
|
| 85 | + } |
|
| 86 | + catch (midcom_error) { |
|
| 86 | 87 | $i++; |
| 87 | 88 | continue; |
| 88 | 89 | } |
@@ -160,7 +161,8 @@ discard block |
||
| 160 | 161 | try { |
| 161 | 162 | $merger = new org_openpsa_contacts_duplicates_merge($this->mode, $this->_config); |
| 162 | 163 | $merger->merge_delete($object1, $object2); |
| 163 | - } catch (midcom_error $e) { |
|
| 164 | + } |
|
| 165 | + catch (midcom_error $e) { |
|
| 164 | 166 | // TODO: Localize |
| 165 | 167 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), 'Merge failed, errstr: ' . $e->getMessage(), 'error'); |
| 166 | 168 | } |