Completed
Push — master ( db7709...24ebcc )
by Daniel
10:24
created
controller/blocks_admin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,7 @@
 block discarded – undo
77 77
 			$return_data = $command->execute($style_id);
78 78
 
79 79
 			$this->action_handler->clear_cache();
80
-		}
81
-		catch (\blitze\sitemaker\exception\base $e)
80
+		} catch (\blitze\sitemaker\exception\base $e)
82 81
 		{
83 82
 			$json_data['message'] = $e->get_message($this->user);
84 83
 		}
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
@@ -58,12 +58,10 @@
 block discarded – undo
58 58
 			$return_data = $command->execute();
59 59
 
60 60
 			$this->action_handler->clear_cache();
61
-		}
62
-		catch (\blitze\sitemaker\exception\base $e)
61
+		} catch (\blitze\sitemaker\exception\base $e)
63 62
 		{
64 63
 			$return_data['message'] = $e->get_message($this->user);
65
-		}
66
-		catch (\Exception $e)
64
+		} catch (\Exception $e)
67 65
 		{
68 66
 			$return_data['message'] = $this->user->lang($e->getMessage());
69 67
 		}
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
@@ -336,8 +336,7 @@  discard block
 block discarded – undo
336 336
 		if ($this->settings['display_preview'])
337 337
 		{
338 338
 			$post_data = $this->forum->get_post_data($this->settings['display_preview']);
339
-		}
340
-		else
339
+		} else
341 340
 		{
342 341
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
343 342
 		}
@@ -360,8 +359,7 @@  discard block
 block discarded – undo
360 359
 				$this->fields['user_colour'] = 'topic_last_poster_colour';
361 360
 
362 361
 				$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->user->lang('LAST_POST_BY_AUTHOR'));
363
-			}
364
-			else
362
+			} else
365 363
 			{
366 364
 				$this->fields['time'] = 'topic_time';
367 365
 				$this->fields['user_id'] = 'topic_poster';
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
@@ -79,8 +79,7 @@
 block discarded – undo
79 79
 				'title'		=> 'LOGIN',
80 80
 				'content'	=> $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block')
81 81
 			);
82
-		}
83
-		else if ($settings['show_member_menu'])
82
+		} else if ($settings['show_member_menu'])
84 83
 		{
85 84
 			$block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu');
86 85
 			$block->set_template($this->ptemplate);
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
@@ -237,8 +237,7 @@
 block discarded – undo
237 237
 			{
238 238
 				$padding .= $pad_with;
239 239
 				$padding_store[$row['parent_id']] = $padding;
240
-			}
241
-			else if ($row['left_id'] > $right + 1)
240
+			} else if ($row['left_id'] > $right + 1)
242 241
 			{
243 242
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
244 243
 			}
Please login to merge, or discard this patch.
services/blocks/action/save_blocks.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,8 +50,7 @@  discard block
 block discarded – undo
50 50
 		if (!empty($collection))
51 51
 		{
52 52
 			return $collection->get_entities();
53
-		}
54
-		else
53
+		} else
55 54
 		{
56 55
 			return array();
57 56
 		}
@@ -88,8 +87,7 @@  discard block
 block discarded – undo
88 87
 		if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions))
89 88
 		{
90 89
 			$this->route_mapper->delete($route);
91
-		}
92
-		else
90
+		} else
93 91
 		{
94 92
 			$route->set_has_blocks($has_blocks);
95 93
 			$this->route_mapper->save($route);
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
@@ -135,8 +135,7 @@  discard block
 block discarded – undo
135 135
 		if ($this->request->is_set('style'))
136 136
 		{
137 137
 			return $this->request->variable('style', 0);
138
-		}
139
-		else
138
+		} else
140 139
 		{
141 140
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
142 141
 		}
@@ -172,8 +171,7 @@  discard block
 block discarded – undo
172 171
 				self::SHOW_BLOCK_LANDING	=> true,
173 172
 				self::SHOW_BLOCK_SUBPAGE	=> false,
174 173
 			);
175
-		}
176
-		else
174
+		} else
177 175
 		{
178 176
 			$modes = array(
179 177
 				self::SHOW_BLOCK_BOTH		=> true,
@@ -200,8 +198,7 @@  discard block
 block discarded – undo
200 198
 			}
201 199
 
202 200
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1));
203
-		}
204
-		else
201
+		} else
205 202
 		{
206 203
 			$edit_mode = false;
207 204
 		}
Please login to merge, or discard this patch.
services/blocks/cfg_fields.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -405,8 +405,7 @@
 block discarded – undo
405 405
 			if (is_array($title))
406 406
 			{
407 407
 				$this->_add_lang_vars($title);
408
-			}
409
-			else if (!isset($this->user->lang[$title]))
408
+			} else if (!isset($this->user->lang[$title]))
410 409
 			{
411 410
 				$this->user->lang[$title] = $title;
412 411
 			}
Please login to merge, or discard this patch.
services/blocks.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -104,8 +104,7 @@  discard block
 block discarded – undo
104 104
 		if (isset($all_routes[$style_id][$current_route]))
105 105
 		{
106 106
 			return $all_routes[$style_id][$current_route];
107
-		}
108
-		else
107
+		} else
109 108
 		{
110 109
 			return $this->_get_default_route_info($all_routes, $current_route, $style_id, $edit_mode);
111 110
 		}
@@ -226,8 +225,7 @@  discard block
 block discarded – undo
226 225
 		if (!empty($block['content']))
227 226
 		{
228 227
 			$content = $block['content'];
229
-		}
230
-		else if ($edit_mode)
228
+		} else if ($edit_mode)
231 229
 		{
232 230
 			$content = $this->user->lang('BLOCK_NO_DATA');
233 231
 		}
Please login to merge, or discard this patch.