@@ -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('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error'); |
| 166 | 168 | } |
@@ -47,7 +47,8 @@ |
||
| 47 | 47 | if ($node_id) { |
| 48 | 48 | try { |
| 49 | 49 | $comments_topic = new midcom_db_topic($node_id); |
| 50 | - } catch (midcom_error) { |
|
| 50 | + } |
|
| 51 | + catch (midcom_error) { |
|
| 51 | 52 | return null; |
| 52 | 53 | } |
| 53 | 54 | |
@@ -29,7 +29,8 @@ |
||
| 29 | 29 | foreach ($qb->execute() as $feed) { |
| 30 | 30 | try { |
| 31 | 31 | midcom_db_topic::get_cached($feed->node); |
| 32 | - } catch (midcom_error) { |
|
| 32 | + } |
|
| 33 | + catch (midcom_error) { |
|
| 33 | 34 | debug_add("Node #{$feed->node} does not exist, skipping feed #{$feed->id}", MIDCOM_LOG_ERROR); |
| 34 | 35 | continue; |
| 35 | 36 | } |
@@ -119,7 +119,8 @@ discard block |
||
| 119 | 119 | try { |
| 120 | 120 | $creator = new midcom_db_person($view_metadata->get('creator')); |
| 121 | 121 | $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>"; |
| 122 | - } catch (midcom_error) { |
|
| 122 | + } |
|
| 123 | + catch (midcom_error) { |
|
| 123 | 124 | $creator_string = $l10n->get('unknown person'); |
| 124 | 125 | } |
| 125 | 126 | $formatter = $data['l10n']->get_formatter(); |
@@ -133,7 +134,8 @@ discard block |
||
| 133 | 134 | try { |
| 134 | 135 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
| 135 | 136 | $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>"; |
| 136 | - } catch (midcom_error) { |
|
| 137 | + } |
|
| 138 | + catch (midcom_error) { |
|
| 137 | 139 | $editor_string = $l10n->get('unknown person'); |
| 138 | 140 | } |
| 139 | 141 | |
@@ -112,7 +112,8 @@ discard block |
||
| 112 | 112 | $row['approved'] = $object->is_approved() ? $object->metadata->approved : ''; |
| 113 | 113 | try { |
| 114 | 114 | $row['index_title'] = $reflector->get_object_label($object) ?: '[' . $this->_l10n->get('no title') . ']'; |
| 115 | - } catch (Exception $e) { |
|
| 115 | + } |
|
| 116 | + catch (Exception $e) { |
|
| 116 | 117 | $row['index_title'] = 'ERROR: ' . $e->getMessage(); |
| 117 | 118 | } |
| 118 | 119 | $link = $this->router->generate('object_' . $this->_request_data['default_mode'], ['guid' => $object->guid]); |
@@ -177,7 +178,8 @@ discard block |
||
| 177 | 178 | foreach ($guids as $guid) { |
| 178 | 179 | try { |
| 179 | 180 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 180 | - } catch (midcom_error) { |
|
| 181 | + } |
|
| 182 | + catch (midcom_error) { |
|
| 181 | 183 | continue; |
| 182 | 184 | } |
| 183 | 185 | |
@@ -192,7 +194,8 @@ discard block |
||
| 192 | 194 | foreach ($guids as $guid) { |
| 193 | 195 | try { |
| 194 | 196 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 195 | - } catch (midcom_error) { |
|
| 197 | + } |
|
| 198 | + catch (midcom_error) { |
|
| 196 | 199 | continue; |
| 197 | 200 | } |
| 198 | 201 | |
@@ -17,7 +17,8 @@ |
||
| 17 | 17 | foreach ($data['objects'] as $guid => $privs) { |
| 18 | 18 | try { |
| 19 | 19 | $object = new midcom_db_topic($guid); |
| 20 | - } catch (midcom_error) { |
|
| 20 | + } |
|
| 21 | + catch (midcom_error) { |
|
| 21 | 22 | continue; |
| 22 | 23 | } |
| 23 | 24 | echo "<tr>\n"; |
@@ -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('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error'); |
| 190 | 191 | return; |
| 191 | 192 | } |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | try { |
| 27 | 27 | $person = new midcom_db_person($this->uid); |
| 28 | 28 | $grp = new midcom_db_group($this->gid); |
| 29 | - } catch (midcom_error $e) { |
|
| 29 | + } |
|
| 30 | + catch (midcom_error $e) { |
|
| 30 | 31 | $e->log(); |
| 31 | 32 | return 'Invalid membership record'; |
| 32 | 33 | } |
@@ -43,7 +44,8 @@ discard block |
||
| 43 | 44 | } |
| 44 | 45 | try { |
| 45 | 46 | $person = new midcom_db_person($this->uid); |
| 46 | - } catch (midcom_error) { |
|
| 47 | + } |
|
| 48 | + catch (midcom_error) { |
|
| 47 | 49 | return; |
| 48 | 50 | } |
| 49 | 51 | midcom::get()->cache->invalidate($person->guid); |
@@ -43,7 +43,8 @@ |
||
| 43 | 43 | break; |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | - } catch (midcom_error) { |
|
| 46 | + } |
|
| 47 | + catch (midcom_error) { |
|
| 47 | 48 | } |
| 48 | 49 | |
| 49 | 50 | $path_parts = array_reverse($path_parts); |