Completed
Push — develop ( 29678f...b18c7a )
by Daniel
14:18
created
services/forum/data.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -215,8 +215,7 @@  discard block
 block discarded – undo
215 215
 		if (sizeof($post_ids))
216 216
 		{
217 217
 			$sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids);
218
-		}
219
-		else if (sizeof($this->store['topic']))
218
+		} else if (sizeof($this->store['topic']))
220 219
 		{
221 220
 			$sql_where[] = $this->db->sql_in_set('p.topic_id', array_keys($this->store['topic']));
222 221
 
@@ -240,8 +239,7 @@  discard block
 block discarded – undo
240 239
 		if ($this->_can_track_by_lastread())
241 240
 		{
242 241
 			$info = $this->_build_tracking_info('get_topic_tracking');
243
-		}
244
-		else if ($this->_can_track_anonymous())
242
+		} else if ($this->_can_track_anonymous())
245 243
 		{
246 244
 			$info = $this->_build_tracking_info('get_complete_topic_tracking');
247 245
 		}
Please login to merge, or discard this patch.
services/user_data.php 2 patches
Doc Comments   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	}
65 65
 
66 66
 	/**
67
-	 * @param array $user_ids
67
+	 * @param integer[] $user_ids
68 68
 	 * @param string $sql_where
69 69
 	 * @return array
70 70
 	 */
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * @param string $sql_where
86 86
 	 * @param string $order_by
87
-	 * @param int|bool $limit
87
+	 * @param integer $limit
88 88
 	 * @return array|false
89 89
 	 */
90 90
 	public function query($sql_where = '', $order_by = '', $limit = false)
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	}
145 145
 
146 146
 	/**
147
-	 * @return array
147
+	 * @return boolean
148 148
 	 */
149 149
 	public function get_profile_fields()
150 150
 	{
@@ -421,7 +421,6 @@  discard block
 block discarded – undo
421 421
 	}
422 422
 
423 423
 	/**
424
-	 * @param array $ids
425 424
 	 * @param string $sql_where
426 425
 	 * @param string $order_by
427 426
 	 * @return string
Please login to merge, or discard this 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.