Completed
Pull Request — master (#26)
by Daniel
13:20 queued 11:01
created
services/forum/data.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -232,8 +232,7 @@
 block discarded – undo
232 232
 		if (sizeof($post_ids))
233 233
 		{
234 234
 			$sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids);
235
-		}
236
-		else if (sizeof($this->store['topic']))
235
+		} else if (sizeof($this->store['topic']))
237 236
 		{
238 237
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
239 238
 		}
Please login to merge, or discard this patch.
services/forum/tracker.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
 		if ($this->can_track_by_lastread())
41 41
 		{
42 42
 			$info = $this->build_tracking_info('get_topic_tracking', $forums, $topics);
43
-		}
44
-		else if ($this->can_track_anonymous())
43
+		} else if ($this->can_track_anonymous())
45 44
 		{
46 45
 			$info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics);
47 46
 		}
Please login to merge, or discard this patch.
controller/blocks_admin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@
 block discarded – undo
88 88
 			$return_data = $command->execute($style_id);
89 89
 
90 90
 			$this->action_handler->clear_cache();
91
-		}
92
-		catch (\blitze\sitemaker\exception\base $e)
91
+		} catch (\blitze\sitemaker\exception\base $e)
93 92
 		{
94 93
 			$json_data['message'] = $e->get_message($this->translator);
95 94
 		}
Please login to merge, or discard this patch.
controller/menus_admin.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,12 +63,10 @@
 block discarded – undo
63 63
 			$return_data = $command->execute();
64 64
 
65 65
 			$this->action_handler->clear_cache();
66
-		}
67
-		catch (\blitze\sitemaker\exception\base $e)
66
+		} catch (\blitze\sitemaker\exception\base $e)
68 67
 		{
69 68
 			$return_data['message'] = $e->get_message($this->translator);
70
-		}
71
-		catch (\Exception $e)
69
+		} catch (\Exception $e)
72 70
 		{
73 71
 			$return_data['message'] = $this->translator->lang($e->getMessage());
74 72
 		}
Please login to merge, or discard this patch.
blocks/forum_topics.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -257,8 +257,7 @@  discard block
 block discarded – undo
257 257
 		if ($this->settings['context'] && $this->settings['preview_chars'])
258 258
 		{
259 259
 			$post_data = $this->forum_data->get_post_data($this->settings['context']);
260
-		}
261
-		else
260
+		} else
262 261
 		{
263 262
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
264 263
 		}
@@ -277,8 +276,7 @@  discard block
 block discarded – undo
277 276
 			$this->fields['user_id'] = 'topic_last_poster_id';
278 277
 
279 278
 			$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->translator->lang('LAST_POST_BY_AUTHOR'));
280
-		}
281
-		else
279
+		} else
282 280
 		{
283 281
 			$this->fields['time'] = 'topic_time';
284 282
 			$this->fields['user_id'] = 'topic_poster';
Please login to merge, or discard this patch.
blocks/featured_member.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -130,8 +130,7 @@
 block discarded – undo
130 130
 		if (isset($sort_keys[$this->settings['qtype']]))
131 131
 		{
132 132
 			return $this->user_data->query($sql_where, $sort_keys[$this->settings['qtype']], 1);
133
-		}
134
-		else
133
+		} else
135 134
 		{
136 135
 			$user_id = (int) userlist::get_user_id($this->settings, $change_user);
137 136
 			$data = $this->user_data->get_users(array($user_id), $sql_where);
Please login to merge, or discard this patch.
services/blocks/action/base_action.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,8 +144,7 @@
 block discarded – undo
144 144
 		{
145 145
 			$content = $this->translator->lang('BLOCK_NO_DATA');
146 146
 			$returned_data['status'] = 0;
147
-		}
148
-		else
147
+		} else
149 148
 		{
150 149
 			$content = $returned_data['content'];
151 150
 		}
Please login to merge, or discard this patch.
services/blocks/action/save_blocks.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,8 +118,7 @@
 block discarded – undo
118 118
 		if (!$has_blocks && !$this->route_is_customized($entity->to_array()))
119 119
 		{
120 120
 			$this->route_mapper->delete($entity);
121
-		}
122
-		else
121
+		} else
123 122
 		{
124 123
 			$entity->set_has_blocks($has_blocks);
125 124
 			$this->route_mapper->save($entity);
Please login to merge, or discard this patch.
services/blocks/blocks.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,8 +154,7 @@
 block discarded – undo
154 154
 		if (!empty($returned_data['content']))
155 155
 		{
156 156
 			$content = $returned_data['content'];
157
-		}
158
-		else if ($edit_mode)
157
+		} else if ($edit_mode)
159 158
 		{
160 159
 			$returned_data['status'] = 0;
161 160
 			$content = $this->translator->lang('BLOCK_NO_DATA');
Please login to merge, or discard this patch.