Completed
Branch master (4f76a2)
by Andreas
22:32
created
lib/midcom/exec/touch_attachments.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@
 block discarded – undo
16 16
 foreach ($atts as $att) {
17 17
     try {
18 18
         $att->file_to_cache();
19
-    } catch (midcom_error $e) {
19
+    }
20
+    catch (midcom_error $e) {
20 21
         echo 'Error: ' . $e->getMessage() . "\n";
21 22
     }
22 23
 }
Please login to merge, or discard this patch.
lib/net/nemein/wiki/parser.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,8 @@
 block discarded – undo
63 63
 
64 64
         try {
65 65
             $attachment = new midcom_db_attachment($guid);
66
-        } catch (midcom_error $e) {
66
+        }
67
+        catch (midcom_error $e) {
67 68
             $e->log();
68 69
             return "<span class=\"missing_photo\" title=\"{$guid}\">{$fulltag}</span>{$after}";
69 70
         }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/salesproject.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,14 +120,16 @@
 block discarded – undo
120 120
         if (!empty($this->customer)) {
121 121
             try {
122 122
                 return org_openpsa_contacts_group_dba::get_cached($this->customer);
123
-            } catch (midcom_error $e) {
123
+            }
124
+            catch (midcom_error $e) {
124 125
                 $e->log();
125 126
             }
126 127
         }
127 128
         if (!empty($this->customerContact)) {
128 129
             try {
129 130
                 return org_openpsa_contacts_person_dba::get_cached($this->customerContact);
130
-            } catch (midcom_error $e) {
131
+            }
132
+            catch (midcom_error $e) {
131 133
                 $e->log();
132 134
             }
133 135
         }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/handler/duplicates/person.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@  discard block
 block discarded – undo
66 66
             try {
67 67
                 $person1 = new org_openpsa_contacts_person_dba($param->parentguid);
68 68
                 $person2 = new org_openpsa_contacts_person_dba($param->name);
69
-            } catch (midcom_error $e) {
69
+            }
70
+            catch (midcom_error $e) {
70 71
                 $i++;
71 72
                 continue;
72 73
             }
@@ -137,7 +138,8 @@  discard block
 block discarded – undo
137 138
                 try {
138 139
                     $merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
139 140
                     $merger->merge_delete($person1, $person2);
140
-                } catch (midcom_error $e) {
141
+                }
142
+                catch (midcom_error $e) {
141 143
                     // TODO: Localize
142 144
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
143 145
                 }
Please login to merge, or discard this patch.
lib/net/nemein/redirector/viewer.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,8 @@
 block discarded – undo
152 152
                     try {
153 153
                         $topic = new midcom_db_topic($id);
154 154
                         $id = $topic->id;
155
-                    } catch (midcom_error $e) {
155
+                    }
156
+                    catch (midcom_error $e) {
156 157
                         $e->log();
157 158
                         break;
158 159
                     }
Please login to merge, or discard this patch.
lib/net/nemein/wiki/handler/feed.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@
 block discarded – undo
66 66
             try {
67 67
                 $author = new midcom_db_person($wikipage->metadata->revisor);
68 68
                 $item->author = $author->name;
69
-            } catch (midcom_error $e) {
69
+            }
70
+            catch (midcom_error $e) {
70 71
                 $e->log();
71 72
             }
72 73
 
Please login to merge, or discard this patch.
lib/midcom/helper/nav/main.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,8 @@
 block discarded – undo
296 296
         // the tree. This is, for example, used by the on-delete cache invalidation.
297 297
         try {
298 298
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
299
-        } catch (midcom_error $e) {
299
+        }
300
+        catch (midcom_error $e) {
300 301
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
301 302
         }
302 303
         if (!empty($object)) {
Please login to merge, or discard this patch.
lib/midcom/helper/nav/leaf.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
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
53 53
             try {
54 54
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
55
-            } catch (midcom_error $e) {
55
+            }
56
+            catch (midcom_error $e) {
56 57
             }
57 58
         } else {
58 59
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");
Please login to merge, or discard this patch.
lib/midcom/helper/metadata.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -658,7 +658,8 @@
 block discarded – undo
658 658
             && mgd_is_guid($guid)) {
659 659
             try {
660 660
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
661
-            } catch (midcom_error $e) {
661
+            }
662
+            catch (midcom_error $e) {
662 663
                 debug_add("Failed to create a metadata instance for the GUID {$guid}: " . $e->getMessage(), MIDCOM_LOG_WARN);
663 664
                 debug_print_r("Source was:", $source);
664 665
 
Please login to merge, or discard this patch.