Completed
Pull Request — master (#26)
by Daniel
11:49 queued 09:28
created
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.
blocks/whats_new.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,8 +72,7 @@  discard block
 block discarded – undo
72 72
 				'title'		=> '',
73 73
 				'content'	=> '',
74 74
 			);
75
-		}
76
-		else
75
+		} else
77 76
 		{
78 77
 			$this->fetch_new($bdata['settings']);
79 78
 
@@ -117,8 +116,7 @@  discard block
 block discarded – undo
117 116
 		{
118 117
 			$sorting = 't.topic_last_post_time';
119 118
 			$sql_array = $this->get_topics_sql();
120
-		}
121
-		else
119
+		} else
122 120
 		{
123 121
 			$sorting = 'p.post_time';
124 122
 			$sql_array = $this->get_posts_sql();
Please login to merge, or discard this patch.
blocks/custom.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -150,8 +150,7 @@
 block discarded – undo
150 150
 		if (!$block_exists)
151 151
 		{
152 152
 			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
153
-		}
154
-		else
153
+		} else
155 154
 		{
156 155
 			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
157 156
 		}
Please login to merge, or discard this patch.
blocks/login.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,8 +84,7 @@
 block discarded – undo
84 84
 			));
85 85
 
86 86
 			$content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block');
87
-		}
88
-		else if ($settings['show_member_menu'])
87
+		} else if ($settings['show_member_menu'])
89 88
 		{
90 89
 			$block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu');
91 90
 			$block->set_template($this->ptemplate);
Please login to merge, or discard this patch.
services/poll.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,8 +303,7 @@
 block discarded – undo
303 303
 				$cur_voted_id[] = $row['poll_option_id'];
304 304
 			}
305 305
 			$this->db->sql_freeresult($result);
306
-		}
307
-		else
306
+		} else
308 307
 		{
309 308
 			// Cookie based guest tracking ... I don't like this but hum ho
310 309
 			// it's oft requested. This relies on "nice" users who don't feel
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/cfg_handler.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,8 +225,7 @@
 block discarded – undo
225 225
 				$this->set_params($field, $vars, $db_settings);
226 226
 				$this->$method($vars, $type, $field, $db_settings);
227 227
 			}
228
-		}
229
-		else
228
+		} else
230 229
 		{
231 230
 			$object = $vars['object'];
232 231
 			$this->set_params($field, $vars, $db_settings);
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.