Completed
Pull Request — master (#26)
by Daniel
14:36 queued 12:14
created
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
@@ -242,8 +242,7 @@
 block discarded – undo
242 242
 		{
243 243
 			$sql_where[] = $this->db->sql_in_set('p.post_id', array_map('intval', $post_ids));
244 244
 			return $sql_where;
245
-		}
246
-		else if (sizeof($this->store['topic']))
245
+		} else if (sizeof($this->store['topic']))
247 246
 		{
248 247
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
249 248
 		}
Please login to merge, or discard this patch.
services/menus/navigation.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
58 58
 		if (!$is_navigation)
59 59
 		{
60 60
 			$this->tree->display_list($data['items'], $template, 'tree');
61
-		}
62
-		else
61
+		} else
63 62
 		{
64 63
 			$this->tree->set_params($settings);
65 64
 			$this->tree->display_navlist($data, $template, 'tree');
Please login to merge, or discard this patch.
controller/upload.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,8 +76,7 @@
 block discarded – undo
76 76
 		{
77 77
 			$file->remove();
78 78
 			$json_data['message'] = implode('<br />', $file->error);
79
-		}
80
-		else
79
+		} else
81 80
 		{
82 81
 			$json_data['location'] = $file->get('realname');
83 82
 		}
Please login to merge, or discard this patch.
blocks/whois.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@
 block discarded – undo
69 69
 		if ($data['TOTAL_USERS_ONLINE'])
70 70
 		{
71 71
 			list($l_online_users, $online_userlist, $l_online_record) = array_values($data);
72
-		}
73
-		else
72
+		} else
74 73
 		{
75 74
 			$item_id = 0;
76 75
 			$item = 'forum';
Please login to merge, or discard this patch.
services/tree/display.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -240,8 +240,7 @@
 block discarded – undo
240 240
 		{
241 241
 			$padding .= $pad_with;
242 242
 			$padding_store[$row['parent_id']] = $padding;
243
-		}
244
-		else if ($row['left_id'] > $right + 1)
243
+		} else if ($row['left_id'] > $right + 1)
245 244
 		{
246 245
 			$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
247 246
 		}
Please login to merge, or discard this patch.