Completed
Pull Request — master (#26)
by Daniel
15:00 queued 12:58
created
services/forum/query_builder.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 			$this->store['sql_array']['SELECT'][] = 'ws.notify_status';
168 168
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
169 169
 				'FROM'	=> array($keys[$type]['table'] => 'ws'),
170
-				'ON'	=> $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'],
170
+				'ON'	=> $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'],
171 171
 			);
172 172
 		}
173 173
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
187 187
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
188 188
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
189
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
189
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
190 190
 			);
191 191
 		}
192 192
 
@@ -207,12 +207,12 @@  discard block
 block discarded – undo
207 207
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
208 208
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
209 209
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
210
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
210
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
211 211
 			);
212 212
 
213 213
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
214 214
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
215
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
215
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
216 216
 			);
217 217
 		}
218 218
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	{
232 232
 		if ($unix_start_time && $unix_stop_time)
233 233
 		{
234
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
234
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
235 235
 		}
236 236
 
237 237
 		return $this;
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 	 */
264 264
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
265 265
 	{
266
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
266
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
267 267
 
268 268
 		return $this;
269 269
 	}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	{
325 325
 		if (!empty($column_id))
326 326
 		{
327
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
327
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
328 328
 		}
329 329
 	}
330 330
 
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 	{
336 336
 		if ($check_visibility)
337 337
 		{
338
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
338
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
339 339
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
340 340
 		}
341 341
 	}
Please login to merge, or discard this patch.
model/entity/item.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 */
137 137
 	public function set_item_icon($icon)
138 138
 	{
139
-		$this->item_icon = ($icon) ? trim($icon) . ' ' : '';
139
+		$this->item_icon = ($icon) ? trim($icon).' ' : '';
140 140
 		return $this;
141 141
 	}
142 142
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		// add leading / for local paths, except leading hashtags
154 154
 		if ($this->is_local($this->item_url) && $this->item_url[0] !== '#')
155 155
 		{
156
-			$this->item_url = '/' . ltrim($this->item_url, './');
156
+			$this->item_url = '/'.ltrim($this->item_url, './');
157 157
 		}
158 158
 
159 159
 		return $this;
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 
169 169
 		if ($this->is_local($item_url) && $item_url[0] === '/')
170 170
 		{
171
-			$item_url = $this->board_url . $item_url;
171
+			$item_url = $this->board_url.$item_url;
172 172
 			if ($this->mod_rewrite_enabled)
173 173
 			{
174 174
 				$item_url = str_replace('app.php/', '', $item_url);
Please login to merge, or discard this patch.