Completed
Pull Request — master (#26)
by Daniel
10:32 queued 08:32
created
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.
services/blocks/display.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@  discard block
 block discarded – undo
86 86
 		if ($this->request->is_set('style'))
87 87
 		{
88 88
 			return $this->request->variable('style', 0);
89
-		}
90
-		else
89
+		} else
91 90
 		{
92 91
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
93 92
 		}
@@ -131,8 +130,7 @@  discard block
 block discarded – undo
131 130
 				self::SHOW_ON_PARENT_ROUTE_ONLY	=> true,
132 131
 				self::SHOW_ON_CHILD_ROUTE_ONLY	=> false,
133 132
 			);
134
-		}
135
-		else
133
+		} else
136 134
 		{
137 135
 			$modes = array(
138 136
 				self::SHOW_ON_ALL_ROUTES		=> true,
@@ -164,8 +162,7 @@  discard block
 block discarded – undo
164 162
 			}
165 163
 
166 164
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
167
-		}
168
-		else
165
+		} else
169 166
 		{
170 167
 			$edit_mode = false;
171 168
 		}
Please login to merge, or discard this patch.
services/url_checker.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
41 41
 		if (extension_loaded('curl') && $curl)
42 42
 		{
43 43
 			$headers = $this->curl_header($url);
44
-		}
45
-		else
44
+		} else
46 45
 		{
47 46
 			$headers = get_headers($url);
48 47
 			$headers = $headers[0];
Please login to merge, or discard this patch.
services/users/data.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -288,8 +288,7 @@
 block discarded – undo
288 288
 					'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
289 289
 					'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
290 290
 				);
291
-			}
292
-			else
291
+			} else
293 292
 			{
294 293
 				$this->user_cache[$user_id]['profile_fields'][$field] = $field_data;
295 294
 			}
Please login to merge, or discard this patch.
services/forum/data.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -235,8 +235,7 @@
 block discarded – undo
235 235
 		if (sizeof($post_ids))
236 236
 		{
237 237
 			return $this->db->sql_in_set('p.post_id', array_map('intval', $post_ids));
238
-		}
239
-		else if (sizeof($this->store['topic']))
238
+		} else if (sizeof($this->store['topic']))
240 239
 		{
241 240
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
242 241
 		}
Please login to merge, or discard this patch.