Completed
Branch master (c1061b)
by Andreas
20:29
created
lib/org/openpsa/user/handler/group/privileges.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
         // Get the calendar root event
24 24
         if ($root_event = org_openpsa_calendar_interface::find_root_event()) {
25
-            $field =& $schemadb->get('default')->get_field('calendar');
25
+            $field = & $schemadb->get('default')->get_field('calendar');
26 26
             $field['type_config']['privilege_object'] = $root_event;
27 27
             $field['type_config']['assignee'] = 'group:' . $group->guid;
28 28
         }
Please login to merge, or discard this patch.
lib/org/openpsa/user/handler/person/privileges.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
         // Get the calendar root event
24 24
         if ($root_event = org_openpsa_calendar_interface::find_root_event()) {
25
-            $field =& $schemadb->get('default')->get_field('calendar');
25
+            $field = & $schemadb->get('default')->get_field('calendar');
26 26
             $field['type_config']['privilege_object'] = $root_event;
27 27
             $field['type_config']['assignee'] = 'user:' . $person->guid;
28 28
         }
Please login to merge, or discard this patch.
lib/net/nehmer/blog/handler/archive.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -409,7 +409,8 @@
 block discarded – undo
409 409
             foreach ($this->_articles as $article_counter => $article) {
410 410
                 try {
411 411
                     $data['datamanager']->set_storage($article);
412
-                } catch (midcom_error $e) {
412
+                }
413
+                catch (midcom_error $e) {
413 414
                     $e->log();
414 415
                     continue;
415 416
                 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
         $year_data = [];
135 135
         $first_post = $this->_compute_welcome_first_post();
136 136
         $this->_request_data['first_post'] = $first_post;
137
-        $this->_request_data['total_count'] =& $total_count;
138
-        $this->_request_data['year_data'] =& $year_data;
137
+        $this->_request_data['total_count'] = & $total_count;
138
+        $this->_request_data['year_data'] = & $year_data;
139 139
         if (!$first_post) {
140 140
             return;
141 141
         }
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
         switch ($handler_id) {
272 272
             case 'archive-year-category':
273 273
                 $data['category'] = trim(strip_tags($args[1]));
274
-                if (   $data['datamanager']->get_schema('default')->has_field('categories')
274
+                if ($data['datamanager']->get_schema('default')->has_field('categories')
275 275
                     && !$data['datamanager']->get_schema('default')->get_field('categories')['type_config']['allow_multiple']) {
276 276
                     $qb->add_constraint('extra1', '=', (string) $data['category']);
277 277
                 } else {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
             throw new midcom_error_notfound("The year '{$year}' is not a valid year identifier.");
361 361
         }
362 362
 
363
-        if (   $month < 1
363
+        if ($month < 1
364 364
             || $month > 12) {
365 365
             throw new midcom_error_notfound("The year {$month} is not a valid year identifier.");
366 366
         }
Please login to merge, or discard this patch.
src/midcom/datamanager/template/csv.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
     public function form_widget_simple(FormView $view, array $data)
19 19
     {
20
-        if (   !empty($data['value'])
20
+        if (!empty($data['value'])
21 21
             || is_numeric($data['value'])) {
22 22
             return $data['value'];
23 23
         }
Please login to merge, or discard this patch.
lib/org/openpsa/user/handler/lostpassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
             case 'save':
45 45
                 $this->_reset_password($data['controller']->get_form_values());
46 46
                 $data['processing_msg'] = $this->_l10n->get('password reset, mail sent.');
47
-                $data['processing_msg_raw']= 'password reset, mail sent.';
47
+                $data['processing_msg_raw'] = 'password reset, mail sent.';
48 48
                 $this->_success = true;
49 49
                 break;
50 50
 
Please login to merge, or discard this patch.
lib/net/nehmer/static/handler/view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             ]);
47 47
         }
48 48
 
49
-        if (   $this->_article->topic === $this->_topic->id
49
+        if ($this->_article->topic === $this->_topic->id
50 50
             && $this->_article->can_do('midgard:delete')) {
51 51
             $delete = $this->get_workflow('delete', ['object' => $this->_article]);
52 52
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         $this->_datamanager->set_storage($this->_article);
115 115
 
116 116
         $arg = $this->_article->name ?: $this->_article->guid;
117
-        if (   $arg != 'index'
117
+        if ($arg != 'index'
118 118
             && $this->_config->get('hide_navigation')) {
119 119
             $this->add_breadcrumb("{$arg}/", $this->_article->title);
120 120
         }
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
         midcom::get()->metadata->set_request_metadata($this->_article->metadata->revised, $this->_article->guid);
125 125
         $this->bind_view_to_object($this->_article, $this->_datamanager->get_schema()->get_name());
126 126
 
127
-        if (   $this->_config->get('indexinnav')
127
+        if ($this->_config->get('indexinnav')
128 128
             || $this->_config->get('autoindex')
129 129
             || $this->_article->name != 'index') {
130 130
             $this->set_active_leaf($this->_article->id);
131 131
         }
132 132
 
133
-        if (   $this->_config->get('folder_in_title')
133
+        if ($this->_config->get('folder_in_title')
134 134
             && $this->_topic->extra != $this->_article->title) {
135 135
             midcom::get()->head->set_pagetitle("{$this->_topic->extra}: {$this->_article->title}");
136 136
         } else {
Please login to merge, or discard this patch.
lib/midcom/style/midcom_datamanager_unlock.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,8 @@
 block discarded – undo
7 7
 try {
8 8
     $person = new midcom_db_person($metadata->locker);
9 9
     $name = $person->name;
10
-} catch (midcom_error $e) {
10
+}
11
+catch (midcom_error $e) {
11 12
     $name = $l10n_midcom->get('unknown user');
12 13
     $e->log();
13 14
 }
Please login to merge, or discard this patch.
lib/net/nemein/wiki/style/view-wikipage-whatlinks.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
     foreach ($data['wikilinks'] as $link) {
13 13
         try {
14 14
             $page = new net_nemein_wiki_wikipage($link->frompage);
15
-        } catch (midcom_error $e) {
15
+        }
16
+        catch (midcom_error $e) {
16 17
             $e->log();
17 18
             continue;
18 19
         }
Please login to merge, or discard this patch.
lib/net/nemein/wiki/style/view-latest-item.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
     </td>
23 23
     <td class="revisor">
24 24
         <?php
25
-        if (   $history['user']
25
+        if ($history['user']
26 26
             && $user = midcom::get()->auth->get_user($history['user'])) {
27 27
             $person_label = org_openpsa_widgets_contact::get($user->guid)->show_inline();
28 28
             echo "                    {$person_label}\n";
Please login to merge, or discard this patch.