Completed
Push — develop ( fd370c...e87922 )
by Daniel
09:46 queued 07:22
created
services/actions/topic/index.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -272,16 +272,13 @@
 block discarded – undo
272 272
 		if ($topic_deleted)
273 273
 		{
274 274
 			$topic_status = 'deleted';
275
-		}
276
-		else if ($topic_unapproved)
275
+		} else if ($topic_unapproved)
277 276
 		{
278 277
 			$topic_status = 'unapproved';
279
-		}
280
-		else if ($row['topic_time'] > time())
278
+		} else if ($row['topic_time'] > time())
281 279
 		{
282 280
 			$topic_status = 'scheduled';
283
-		}
284
-		else
281
+		} else
285 282
 		{
286 283
 			$topic_status = $this->filter_topic_types_ary[$row['topic_type']];
287 284
 		}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	public function execute($u_action, $mode = '')
92 92
 	{
93
-		include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
93
+		include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
94 94
 
95 95
 		$this->language->add_lang('viewforum');
96 96
 		$this->language->add_lang('manager', 'blitze/content');
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 		$filter_topic_status = $this->apply_status_filter($sql_where_array);
104 104
 		$filter_content_type = $this->apply_content_type_filter();
105 105
 
106
-		$callable = 'init_' . $mode . '_mode';
107
-		$this->base_url = $u_action . (sizeof($this->params) ? '&' : '');
106
+		$callable = 'init_'.$mode.'_mode';
107
+		$this->base_url = $u_action.(sizeof($this->params) ? '&' : '');
108 108
 		$this->$callable($content_types, $sql_where_array);
109 109
 
110 110
 		$this->forum->query()
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 		$topic_tracking_info = $this->forum->get_topic_tracking_info();
136 136
 
137 137
 		$topics_data = array_values($topics_data);
138
-		$base_url = $u_action . http_build_query($this->params);
138
+		$base_url = $u_action.http_build_query($this->params);
139 139
 
140 140
 		for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
141 141
 		{
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	{
171 171
 		return array(
172 172
 			'ATTACH_ICON_IMG'	=> $this->get_attachment_icon($row),
173
-			'U_REVIEW_TOPIC'	=> $u_action . "&amp;do=view&amp;type=$content_type&amp;t=" . $row['topic_id'],
173
+			'U_REVIEW_TOPIC'	=> $u_action."&amp;do=view&amp;type=$content_type&amp;t=".$row['topic_id'],
174 174
 			'U_DELETE'			=> $this->get_delete_url($mode, $u_action, $row, $post_row),
175 175
 		);
176 176
 	}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 			'S_CAN_MAKE_NORMAL'		=> ($s_can_make_sticky || $s_can_make_announce),
197 197
 			'S_CAN_MAKE_STICKY'		=> $s_can_make_sticky,
198 198
 			'S_CAN_MAKE_ANNOUNCE'	=> $s_can_make_announce,
199
-			'U_MCP_ACTION'			=> $this->base_url . '&amp;do=moderate&amp;redirect=' . $this->get_redirect_url($this->base_url),
199
+			'U_MCP_ACTION'			=> $this->base_url.'&amp;do=moderate&amp;redirect='.$this->get_redirect_url($this->base_url),
200 200
 		));
201 201
 	}
202 202
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	protected function init_ucp_mode(array $content_types, array &$sql_where_array)
208 208
 	{
209
-		$sql_where_array[] =  't.topic_poster = ' . (int) $this->user->data['user_id'];
209
+		$sql_where_array[] = 't.topic_poster = '.(int) $this->user->data['user_id'];
210 210
 
211 211
 		// list all content types that the user can post in
212 212
 		$postable_forums = array_intersect_key($this->content_forums, $this->auth->acl_getf('f_post', true));
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 			$this->template->assign_block_vars('postable', array(
219 219
 				'TYPE'		=> $entity->get_content_langname(),
220 220
 				'COLOUR'	=> $entity->get_content_colour(),
221
-				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting." . $this->php_ext, 'mode=post&amp;f=' . $entity->get_forum_id()),
221
+				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting.".$this->php_ext, 'mode=post&amp;f='.$entity->get_forum_id()),
222 222
 			));
223 223
 		}
224 224
 	}
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 			'CONTENT_TYPE'			=> $entity->get_content_langname(),
238 238
 			'CONTENT_TYPE_COLOR'	=> $entity->get_content_colour(),
239 239
 			'S_COMMENTS'			=> $entity->get_allow_comments(),
240
-			'U_CONTENT_TYPE'		=> $base_url . "&amp;type=$type",
240
+			'U_CONTENT_TYPE'		=> $base_url."&amp;type=$type",
241 241
 		);
242 242
 	}
243 243
 
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
287 287
 		}
288 288
 
289 289
 		return array(
290
-			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_' . strtoupper($topic_status)),
291
-			'U_TOPIC_STATUS'	=> $base_url . "&amp;status=$topic_status",
290
+			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_'.strtoupper($topic_status)),
291
+			'U_TOPIC_STATUS'	=> $base_url."&amp;status=$topic_status",
292 292
 		);
293 293
 	}
294 294
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		if ($mode === 'mcp')
317 317
 		{
318 318
 			$u_mcp_queue = $this->get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id);
319
-			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id, true, $this->user->session_id) : $u_mcp_queue;
319
+			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t='.$topic_id, true, $this->user->session_id) : $u_mcp_queue;
320 320
 		}
321 321
 
322 322
 		return array(
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	 */
333 333
 	protected function get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id)
334 334
 	{
335
-		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$topic_id", true, $this->user->session_id) : '';
335
+		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode='.(($topic_unapproved) ? 'approve_details' : 'unapproved_posts')."&amp;t=$topic_id", true, $this->user->session_id) : '';
336 336
 	}
337 337
 
338 338
 	/**
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 			if ($mode === 'mcp')
350 350
 			{
351 351
 				$redirect_url = $this->get_redirect_url($u_action);
352
-				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t=' . $row['topic_id'] . '&amp;redirect=' . $redirect_url, true, $this->user->session_id);
352
+				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t='.$row['topic_id'].'&amp;redirect='.$redirect_url, true, $this->user->session_id);
353 353
 			}
354 354
 		}
355 355
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 	 */
363 363
 	protected function get_redirect_url($base_url)
364 364
 	{
365
-		$base_url .= (sizeof($this->params)) ? '&' . http_build_query($this->params) : '';
365
+		$base_url .= (sizeof($this->params)) ? '&'.http_build_query($this->params) : '';
366 366
 		return urlencode(str_replace('&amp;', '&', $base_url));
367 367
 	}
368 368
 
Please login to merge, or discard this patch.
services/views/base_view.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 * @param \blitze\content\services\helper			$helper				Content helper object
47 47
 	 * @param string									$phpbb_root_path	Path to the phpbb includes directory.
48 48
 	 * @param string									$php_ext			php file extension
49
-	*/
49
+	 */
50 50
 	public function __construct(\phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, $phpbb_root_path, $php_ext)
51 51
 	{
52 52
 		$this->language = $language;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 
122 122
 		for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
123 123
 		{
124
-			$topic_data	= $topics_data[$i];
124
+			$topic_data = $topics_data[$i];
125 125
 			$topic_id	= $topic_data['topic_id'];
126
-			$post_data	= array_shift($posts_data[$topic_id]);
126
+			$post_data = array_shift($posts_data[$topic_id]);
127 127
 
128 128
 			$tpl_data = array_merge(
129 129
 				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
 		$this->pagination->generate_template_pagination(
215 215
 			array(
216 216
 				'routes' => array(
217
-					'blitze_content_' . $route,
218
-					'blitze_content_' . $route . '_page',
217
+					'blitze_content_'.$route,
218
+					'blitze_content_'.$route.'_page',
219 219
 				),
220 220
 				'params' => $params,
221 221
 			),
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 				'L_USER_ABOUT'			=> $this->language->lang('AUTHOR_INFO_EXPLAIN', $user_cache['username_full'], $user_cache['joined'], $user_content_topics, $content_langname, $user_cache['posts']),
247 247
 				'L_USER_VIEW_ALL'		=> $this->language->lang('VIEW_AUTHOR_CONTENTS', $content_langname, $user_cache['username']),
248 248
 				'L_SEARCH_USER_POSTS'	=> $this->language->lang('SEARCH_USER_POSTS', $user_cache['username']),
249
-				'U_SEARCH_CONTENTS'		=> append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$user_cache['username']}&amp;" . urlencode('fid[]') . "=$forum_id&amp;sc=0&amp;sf=titleonly&amp;sr=topics")
249
+				'U_SEARCH_CONTENTS'		=> append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$user_cache['username']}&amp;".urlencode('fid[]')."=$forum_id&amp;sc=0&amp;sf=titleonly&amp;sr=topics")
250 250
 			)));
251 251
 		}
252 252
 	}
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 				->fetch_forum($topic_data['forum_id'])
267 267
 				->fetch_topic_poster($topic_data['topic_poster'])
268 268
 				->fetch_custom(array(
269
-					'WHERE' => array('t.topic_id <> ' . (int) $topic_data['topic_id'])
269
+					'WHERE' => array('t.topic_id <> '.(int) $topic_data['topic_id'])
270 270
 				))->build(true, true, false);
271 271
 
272 272
 			$topics_data = $this->forum->get_topic_data(5);
Please login to merge, or discard this patch.
services/views/tiles.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	 * @param \blitze\content\services\helper			$helper				Content helper object
27 27
 	 * @param string									$phpbb_root_path	Path to the phpbb includes directory.
28 28
 	 * @param string									$php_ext			php file extension
29
-	*/
29
+	 */
30 30
 	public function __construct(\phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, $phpbb_root_path, $php_ext)
31 31
 	{
32 32
 		parent::__construct($language, $pagination, $template, $fields, $forum, $helper, $phpbb_root_path, $php_ext);
Please login to merge, or discard this patch.
event/listener.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 	 * @param \blitze\content\services\fields		$fields				Content fields object
45 45
 	 * @param string								$phpbb_root_path	Path to the phpbb includes directory.
46 46
 	 * @param string								$php_ext			php file extension
47
-	*/
47
+	 */
48 48
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \blitze\content\services\types $content_types, \blitze\content\services\fields $fields, $phpbb_root_path, $php_ext)
49 49
 	{
50 50
 		$this->db = $db;
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	public function modify_posts_data(\phpbb\event\data $event)
95 95
 	{
96 96
 		$sql_array = $event['sql_array'];
97
-		$sql_array['WHERE'] .= ' AND t.topic_time <= ' . time();
97
+		$sql_array['WHERE'] .= ' AND t.topic_time <= '.time();
98 98
 
99 99
 		$sql_count = $sql_array;
100 100
 		$sql_count['SELECT'] = 'COUNT(p.post_id) AS total_results';
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
115 115
 	public function modify_topic_data(\phpbb\event\data $event)
116 116
 	{
117 117
 		$sql_where = $event['sql_where'];
118
-		$sql_where .= ' AND t.topic_time <= ' . time();
118
+		$sql_where .= ' AND t.topic_time <= '.time();
119 119
 
120
-		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM ' . $event['sql_from'] . ' WHERE ' . $sql_where;
120
+		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM '.$event['sql_from'].' WHERE '.$sql_where;
121 121
 		$result = $this->db->sql_query($sql);
122 122
 		$total_results = $this->db->sql_fetchfield('total_results');
123 123
 		$this->db->sql_freeresult($result);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	 */
213 213
 	public function add_viewonline_location(\phpbb\event\data $event)
214 214
 	{
215
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/content/') === 0)
215
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/content/') === 0)
216 216
 		{
217 217
 			$types = join('|', $this->content_types->get_forum_types());
218 218
 			preg_match("/\/content\/($types)(\/[0-9]\/.*)?/is", $event['row']['session_page'], $match);
Please login to merge, or discard this patch.
event/posting.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 * Constructor
24 24
 	 *
25 25
 	 * @param \blitze\content\services\builder		$builder		Form builder object
26
-	*/
26
+	 */
27 27
 	public function __construct(\blitze\content\services\builder $builder)
28 28
 	{
29 29
 		$this->builder = $builder;
Please login to merge, or discard this patch.
controller/ucp_controller.php 3 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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 		catch (\blitze\sitemaker\exception\base $e)
47 47
 		{
48 48
 			$message = $e->get_message($this->language);
49
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
49
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
50 50
 		}
51 51
 	}
52 52
 }
Please login to merge, or discard this patch.
controller/mcp_controller.php 3 patches
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.
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 		catch (\blitze\sitemaker\exception\base $e)
47 47
 		{
48 48
 			$message = $e->get_message($this->language);
49
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
49
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
50 50
 		}
51 51
 	}
52 52
 }
Please login to merge, or discard this patch.
controller/admin_controller.php 3 patches
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.
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 		catch (\blitze\sitemaker\exception\base $e)
48 48
 		{
49 49
 			$message = $e->get_message($this->language);
50
-			trigger_error($this->language->lang($message) . adm_back_link($base_url));
50
+			trigger_error($this->language->lang($message).adm_back_link($base_url));
51 51
 		}
52 52
 	}
53 53
 }
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
 			$parse_flags = ($this->content_desc_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
238 237
 			return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $parse_flags);
@@ -250,8 +249,7 @@  discard block
 block discarded – undo
250 249
 		if (!is_array($settings))
251 250
 		{
252 251
 			$this->content_view_settings = $settings;
253
-		}
254
-		else if (sizeof($settings))
252
+		} else if (sizeof($settings))
255 253
 		{
256 254
 			$this->content_view_settings = json_encode($settings);
257 255
 		}
Please login to merge, or discard this patch.