Completed
Branch develop (3861a6)
by Daniel
04:23
created
controller/ucp_controller.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	 *
23 23
 	 * @param \phpbb\language\language					$language			Language object
24 24
 	 * @param \blitze\content\services\action_handler	$action_handler		Handles actions
25
-	*/
25
+	 */
26 26
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\action_handler $action_handler)
27 27
 	{
28 28
 		$this->language = $language;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@
 block discarded – undo
42 42
 		{
43 43
 			$command = $this->action_handler->create('topic', $action);
44 44
 			$command->execute($base_url, 'ucp');
45
-		}
46
-		catch (\blitze\sitemaker\exception\base $e)
45
+		} catch (\blitze\sitemaker\exception\base $e)
47 46
 		{
48 47
 			$message = $e->get_message($this->language);
49 48
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
Please login to merge, or discard this patch.
controller/mcp_controller.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	 *
23 23
 	 * @param \phpbb\language\language					$language			Language object
24 24
 	 * @param \blitze\content\services\action_handler	$action_handler		Handles actions
25
-	*/
25
+	 */
26 26
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\action_handler $action_handler)
27 27
 	{
28 28
 		$this->language = $language;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@
 block discarded – undo
42 42
 		{
43 43
 			$command = $this->action_handler->create('topic', $action);
44 44
 			$command->execute($base_url, 'mcp');
45
-		}
46
-		catch (\blitze\sitemaker\exception\base $e)
45
+		} catch (\blitze\sitemaker\exception\base $e)
47 46
 		{
48 47
 			$message = $e->get_message($this->language);
49 48
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
Please login to merge, or discard this patch.
controller/admin_controller.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	 *
23 23
 	 * @param \phpbb\language\language					$language			Language object
24 24
 	 * @param \blitze\content\services\action_handler	$action_handler		Handles actions
25
-	*/
25
+	 */
26 26
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\action_handler $action_handler)
27 27
 	{
28 28
 		$this->language = $language;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@
 block discarded – undo
43 43
 		{
44 44
 			$command = $this->action_handler->create('type', $action);
45 45
 			$command->execute($base_url, $type);
46
-		}
47
-		catch (\blitze\sitemaker\exception\base $e)
46
+		} catch (\blitze\sitemaker\exception\base $e)
48 47
 		{
49 48
 			$message = $e->get_message($this->language);
50 49
 			trigger_error($this->language->lang($message) . adm_back_link($base_url));
Please login to merge, or discard this patch.
model/entity/field.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -157,8 +157,7 @@  discard block
 block discarded – undo
157 157
 		if ($mode === 'edit')
158 158
 		{
159 159
 			return generate_text_for_edit($this->field_explain, $this->field_exp_uid, $this->field_exp_options);
160
-		}
161
-		else
160
+		} else
162 161
 		{
163 162
 			return generate_text_for_display($this->field_explain, $this->field_exp_uid, $this->field_exp_bitfield, $this->field_exp_options);
164 163
 		}
@@ -175,8 +174,7 @@  discard block
 block discarded – undo
175 174
 		if (!is_array($settings))
176 175
 		{
177 176
 			$this->field_settings = $settings;
178
-		}
179
-		else if (sizeof($settings))
177
+		} else if (sizeof($settings))
180 178
 		{
181 179
 			$this->field_settings = json_encode($settings);
182 180
 		}
Please login to merge, or discard this patch.
model/entity/type.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -306,11 +306,11 @@
 block discarded – undo
306 306
 		$summary_tags = $this->get_template_tags($summary_tags, $this->summary_tpl, $fields);
307 307
 		$detail_tags = $this->get_template_tags($detail_tags, $this->detail_tpl, $fields);
308 308
 
309
-		$this->summary_tags	= array_intersect_key($field_types, array_flip($summary_tags));
310
-		$this->detail_tags	= array_intersect_key($field_types, array_flip($detail_tags));
309
+		$this->summary_tags = array_intersect_key($field_types, array_flip($summary_tags));
310
+		$this->detail_tags = array_intersect_key($field_types, array_flip($detail_tags));
311 311
 
312
-		$this->content_fields	= $content_fields;
313
-		$this->field_types		= $field_types;
312
+		$this->content_fields = $content_fields;
313
+		$this->field_types = $field_types;
314 314
 	}
315 315
 
316 316
 	/**
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -231,8 +231,7 @@  discard block
 block discarded – undo
231 231
 		if ($mode === 'edit')
232 232
 		{
233 233
 			return generate_text_for_edit($this->content_desc, $this->content_desc_uid, $this->content_desc_options);
234
-		}
235
-		else
234
+		} else
236 235
 		{
237 236
 			return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $this->content_desc_options);
238 237
 		}
@@ -249,8 +248,7 @@  discard block
 block discarded – undo
249 248
 		if (!is_array($settings))
250 249
 		{
251 250
 			$this->content_view_settings = $settings;
252
-		}
253
-		else if (sizeof($settings))
251
+		} else if (sizeof($settings))
254 252
 		{
255 253
 			$this->content_view_settings = json_encode($settings);
256 254
 		}
Please login to merge, or discard this patch.
blocks/archive.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 	 * @param \phpbb\controller\helper				$helper					Helper object
45 45
 	 * @param \phpbb\user							$user					User object
46 46
 	 * @param \blitze\content\services\types		$content_types			Content types object
47
-	*/
47
+	 */
48 48
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\user $user, \blitze\content\services\types $content_types, $phpbb_root_path, $php_ext)
49 49
 	{
50 50
 		$this->auth = $auth;
Please login to merge, or discard this patch.
blocks/recent.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 			for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
174 174
 			{
175 175
 				$topic_data	= $topics_data[$i];
176
-				$post_data	= array_shift($posts_data[$topic_data['topic_id']]);
176
+				$post_data = array_shift($posts_data[$topic_data['topic_id']]);
177 177
 
178 178
 				$tpl_data = $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info);
179 179
 				$this->ptemplate->assign_block_vars('topic_row', $tpl_data);
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
202 202
 		);
203 203
 
204
-		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] :  $this->language->lang('CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
204
+		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] : $this->language->lang('CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
205 205
 	}
206 206
 
207 207
 	/**
Please login to merge, or discard this patch.