Completed
Pull Request — master (#26)
by Daniel
12:35 queued 09:53
created
services/forum/query_builder.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -155,13 +155,13 @@  discard block
 block discarded – undo
155 155
 			$this->store['sql_array']['SELECT'][] = 'tw.notify_status';
156 156
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
157 157
 				'FROM'	=> array(TOPICS_WATCH_TABLE => 'tw'),
158
-				'ON'	=> 'tw.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tw.topic_id'
158
+				'ON'	=> 'tw.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tw.topic_id'
159 159
 			);
160 160
 
161 161
 			$this->store['sql_array']['SELECT'][] = 'fw.notify_status';
162 162
 			$this->store['sql_array']['LEFT JOIN'][] = array(
163 163
 				'FROM'	=> array(FORUMS_WATCH_TABLE => 'fw'),
164
-				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = ' . (int) $this->user->data['user_id'] . ')',
164
+				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = '.(int) $this->user->data['user_id'].')',
165 165
 			);
166 166
 		}
167 167
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
181 181
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
182 182
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
183
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
183
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
184 184
 			);
185 185
 		}
186 186
 
@@ -201,12 +201,12 @@  discard block
 block discarded – undo
201 201
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
202 202
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
203 203
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
204
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
204
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
205 205
 			);
206 206
 
207 207
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
208 208
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
209
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
209
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
210 210
 			);
211 211
 		}
212 212
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	{
226 226
 		if ($unix_start_time && $unix_stop_time)
227 227
 		{
228
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
228
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
229 229
 		}
230 230
 
231 231
 		return $this;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 */
258 258
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
259 259
 	{
260
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
260
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
261 261
 
262 262
 		return $this;
263 263
 	}
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 	{
319 319
 		if (!empty($column_id))
320 320
 		{
321
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
321
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
322 322
 		}
323 323
 	}
324 324
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 	{
330 330
 		if ($check_visibility)
331 331
 		{
332
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
332
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
333 333
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
334 334
 		}
335 335
 	}
Please login to merge, or discard this patch.