View GitHub Repository openpsa

Schedule Inspection
Subscribe
Passed
Push — master ( ac4e12...523107 )
by Andreas
25:53
created
Status
Category
Toggle Patches
lib/org/openpsa/contacts/handler/duplicates.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -82,7 +82,8 @@  discard block
 
 block discarded – undo
82 82 
             try {
83 83 
                 $object1 = $this->load($param->parentguid);
84 84 
                 $object2 = $this->load($param->name);
85 
-            } catch (midcom_error $e) {
85 
+            }
86 
+            catch (midcom_error $e) {
86 87 
                 $i++;
87 88 
                 continue;
88 89 
             }
 
@@ -160,7 +161,8 @@  discard block
 
 block discarded – undo
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 
                 }
Please login to merge, or discard this patch.