@@ -203,7 +203,8 @@ |
||
| 203 | 203 | if ($object instanceof mgdobject) { |
| 204 | 204 | try { |
| 205 | 205 | $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object); |
| 206 | - } catch (midcom_error $e) { |
|
| 206 | + } |
|
| 207 | + catch (midcom_error $e) { |
|
| 207 | 208 | return null; |
| 208 | 209 | } |
| 209 | 210 | } else { |
@@ -143,7 +143,8 @@ |
||
| 143 | 143 | debug_add('person #' . $person->id . 'has no email address, aborting'); |
| 144 | 144 | return null; |
| 145 | 145 | } |
| 146 | - } catch (midcom_error $e) { |
|
| 146 | + } |
|
| 147 | + catch (midcom_error $e) { |
|
| 147 | 148 | return null; |
| 148 | 149 | } |
| 149 | 150 | |
@@ -48,7 +48,8 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | try { |
| 50 | 50 | $folder = midcom_db_topic::get_cached($this->topic); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $e->log(); |
| 53 | 54 | } |
| 54 | 55 | $folder->delete_attachment(self::FOLDER_THUMBNAIL); |
@@ -58,7 +59,8 @@ discard block |
||
| 58 | 59 | { |
| 59 | 60 | try { |
| 60 | 61 | return new midcom_db_attachment($this->$type); |
| 61 | - } catch (midcom_error $e) { |
|
| 62 | + } |
|
| 63 | + catch (midcom_error $e) { |
|
| 62 | 64 | $e->log(); |
| 63 | 65 | return null; |
| 64 | 66 | } |
@@ -104,7 +104,8 @@ |
||
| 104 | 104 | { |
| 105 | 105 | $ret = ['org_openpsa_relatedto' => []]; |
| 106 | 106 | foreach ($array as $rel) { |
| 107 | - if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto' |
|
| 107 | + if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { |
|
| 108 | +//Matches also 'org_openpsa_relatedto' |
|
| 108 | 109 | //Wrong type of object found in array, cruelly abort the whole procedure |
| 109 | 110 | return null; |
| 110 | 111 | } |
@@ -96,7 +96,8 @@ discard block |
||
| 96 | 96 | // if the property useContactAddress is set |
| 97 | 97 | $billing_data[0]->set_address(); |
| 98 | 98 | return $billing_data[0]; |
| 99 | - } catch (midcom_error $e) { |
|
| 99 | + } |
|
| 100 | + catch (midcom_error $e) { |
|
| 100 | 101 | $e->log(); |
| 101 | 102 | return null; |
| 102 | 103 | } |
@@ -141,10 +142,12 @@ discard block |
||
| 141 | 142 | { |
| 142 | 143 | try { |
| 143 | 144 | return new org_openpsa_contacts_person_dba($this->linkGuid); |
| 144 | - } catch (midcom_error $e) { |
|
| 145 | + } |
|
| 146 | + catch (midcom_error $e) { |
|
| 145 | 147 | try { |
| 146 | 148 | return new org_openpsa_contacts_group_dba($this->linkGuid); |
| 147 | - } catch (midcom_error $e) { |
|
| 149 | + } |
|
| 150 | + catch (midcom_error $e) { |
|
| 148 | 151 | debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 149 | 152 | return false; |
| 150 | 153 | } |
@@ -102,7 +102,8 @@ |
||
| 102 | 102 | try { |
| 103 | 103 | $mgdschemaclass = $this->__mgdschema_class_name__; |
| 104 | 104 | $this->set_object(new $mgdschemaclass($id)); |
| 105 | - } catch (mgd_exception $e) { |
|
| 105 | + } |
|
| 106 | + catch (mgd_exception $e) { |
|
| 106 | 107 | debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN); |
| 107 | 108 | throw new midcom_error_midgard($e, $id); |
| 108 | 109 | } |
@@ -579,7 +579,8 @@ |
||
| 579 | 579 | { |
| 580 | 580 | try { |
| 581 | 581 | return midcom_db_person::get_cached($guid); |
| 582 | - } catch (midcom_error $e) { |
|
| 582 | + } |
|
| 583 | + catch (midcom_error $e) { |
|
| 583 | 584 | return null; |
| 584 | 585 | } |
| 585 | 586 | } |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | foreach ($items as $identifier => $guid) { |
| 41 | 41 | try { |
| 42 | 42 | $results[$identifier] = new midcom_db_attachment($guid); |
| 43 | - } catch (midcom_error $e) { |
|
| 43 | + } |
|
| 44 | + catch (midcom_error $e) { |
|
| 44 | 45 | $e->log(); |
| 45 | 46 | } |
| 46 | 47 | } |
@@ -193,7 +194,8 @@ discard block |
||
| 193 | 194 | foreach (self::load_map($object, $field) as $identifier => $guid) { |
| 194 | 195 | try { |
| 195 | 196 | $attachments[$identifier] = midcom_db_attachment::get_cached($guid); |
| 196 | - } catch (midcom_error $e) { |
|
| 197 | + } |
|
| 198 | + catch (midcom_error $e) { |
|
| 197 | 199 | $e->log(); |
| 198 | 200 | } |
| 199 | 201 | } |
@@ -56,7 +56,8 @@ discard block |
||
| 56 | 56 | try { |
| 57 | 57 | midcom::get()->dynamic_load($batch_url); |
| 58 | 58 | $ret = true; |
| 59 | - } catch (midcom_error $e) { |
|
| 59 | + } |
|
| 60 | + catch (midcom_error $e) { |
|
| 60 | 61 | $ret = $e->getMessage(); |
| 61 | 62 | } |
| 62 | 63 | ob_end_clean(); |
@@ -83,7 +84,8 @@ discard block |
||
| 83 | 84 | $stat = true; |
| 84 | 85 | try { |
| 85 | 86 | $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']); |
| 86 | - } catch (midcom_error $e) { |
|
| 87 | + } |
|
| 88 | + catch (midcom_error $e) { |
|
| 87 | 89 | $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID"); |
| 88 | 90 | $stat = false; |
| 89 | 91 | } |