Completed
Pull Request — master (#200)
by
unknown
18:52
created
lib/midcom/services/indexer/document.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -680,7 +680,8 @@
 block discarded – undo
680 680
     {
681 681
         try {
682 682
             return midcom_db_person::get_cached($id);
683
-        } catch (midcom_error $e) {
683
+        }
684
+        catch (midcom_error $e) {
684 685
             return false;
685 686
         }
686 687
     }
Please login to merge, or discard this patch.
lib/midcom/config/test.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,8 @@
 block discarded – undo
74 74
                 $config = new midcom_services_rcs_config($config);
75 75
                 $config->test_rcs_config();
76 76
                 $this->add("MidCOM RCS", self::OK);
77
-            } catch (midcom_error $e) {
77
+            }
78
+            catch (midcom_error $e) {
78 79
                 $this->add("MidCOM RCS", self::ERROR, $e->getMessage());
79 80
             }
80 81
         } else {
Please login to merge, or discard this patch.
lib/midcom/core/context.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -181,7 +181,8 @@
 block discarded – undo
181 181
         } else {
182 182
             try {
183 183
                 $root_node = midcom_db_topic::get_cached($guid);
184
-            } catch (midcom_error $e) {
184
+            }
185
+            catch (midcom_error $e) {
185 186
                 if ($e instanceof midcom_error_forbidden) {
186 187
                     throw $e;
187 188
                 }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/toolbar.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,8 @@
 block discarded – undo
117 117
                                 }
118 118
                                 break;
119 119
                         }
120
-                    } catch (midcom_error $e) {
120
+                    }
121
+                    catch (midcom_error $e) {
121 122
                         $e->log();
122 123
                     }
123 124
                 }
Please login to merge, or discard this patch.
lib/midgard/admin/user/handler/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,7 +217,8 @@
 block discarded – undo
217 217
 
218 218
         try {
219 219
             $account = new midcom_core_account($person);
220
-        } catch (midcom_error $e) {
220
+        }
221
+        catch (midcom_error $e) {
221 222
             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');
222 223
             return;
223 224
         }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/handler/journal/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,8 @@
 block discarded – undo
171 171
                 //create reflector with linked object to get the right label
172 172
                 try {
173 173
                     $linked_object = midcom::get()->dbfactory->get_object_by_guid($entry->linkGuid);
174
-                } catch (midcom_error $e) {
174
+                }
175
+                catch (midcom_error $e) {
175 176
                     unset($data['entries'][$i]);
176 177
                     $e->log();
177 178
                     continue;
Please login to merge, or discard this patch.
lib/org/openpsa/mypage/handler/workingon.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,8 @@
 block discarded – undo
92 92
                         $customer = new org_openpsa_contacts_group_dba($customer_id);
93 93
                         $customer_label = $customer->official;
94 94
                         $customer = $customer_id;
95
-                    } catch (midcom_error $e) {
95
+                    }
96
+                    catch (midcom_error $e) {
96 97
                     }
97 98
                 }
98 99
             }
Please login to merge, or discard this patch.
lib/org/openpsa/notifications/main.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@
 block discarded – undo
52 52
         // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs?
53 53
         try {
54 54
             $recipient = midcom_db_person::get_cached($recipient);
55
-        } catch (midcom_error $e) {
55
+        }
56
+        catch (midcom_error $e) {
56 57
             return false;
57 58
         }
58 59
 
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/scheduler.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,8 @@
 block discarded – undo
126 126
         $salesproject = org_openpsa_sales_salesproject_dba::get_cached($this->_deliverable->salesproject);
127 127
         try {
128 128
             $owner = midcom_db_person::get_cached($salesproject->owner);
129
-        } catch (midcom_error $e) {
129
+        }
130
+        catch (midcom_error $e) {
130 131
             $e->log();
131 132
             return;
132 133
         }
Please login to merge, or discard this patch.