Completed
Pull Request — master (#26)
by Daniel
21:33 queued 11:11
created
acp/settings_module.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
142 142
 			$this->config->set('sm_navbar_menu', $this->request->variable('navbar_menu', 0));
143 143
 
144
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
144
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
145 145
 		}
146 146
 	}
147 147
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	{
154 154
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
155 155
 
156
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
156
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
157 157
 
158 158
 		$styles = array();
159 159
 		while ($row = $this->db->sql_fetchrow($result))
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 			$path = dirname($path);
232 232
 			$name = basename($path);
233 233
 
234
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
234
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
235 235
 		}
236 236
 		ksort($layouts);
237 237
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 			$id = $entity->get_menu_id();
255 255
 			$name = $entity->get_menu_name();
256 256
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
257
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
257
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
258 258
 		}
259 259
 
260 260
 		return $options;
Please login to merge, or discard this patch.
services/forum/query_builder.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -276,9 +276,9 @@
 block discarded – undo
276 276
 	/**
277 277
 	 * Build the query
278 278
 	 *
279
-	 * @param bool|true $check_visibility		Should we only return data from forums the user is allowed to see?
280
-	 * @param bool|true $enable_caching			Should the query be cached where possible?
281
-	 * @param bool|true $exclude_hidden_forums	Leave out hidden forums?
279
+	 * @param boolean $check_visibility		Should we only return data from forums the user is allowed to see?
280
+	 * @param boolean $enable_caching			Should the query be cached where possible?
281
+	 * @param boolean $exclude_hidden_forums	Leave out hidden forums?
282 282
 	 * @return $this
283 283
 	 */
284 284
 	public function build($check_visibility = true, $enable_caching = true, $exclude_hidden_forums = true)
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 			$this->store['sql_array']['SELECT'][] = 'ws.notify_status';
166 166
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
167 167
 				'FROM'	=> array($keys[$type]['table'] => 'ws'),
168
-				'ON'	=> $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'],
168
+				'ON'	=> $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'],
169 169
 			);
170 170
 		}
171 171
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
185 185
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
186 186
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
187
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
187
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
188 188
 			);
189 189
 		}
190 190
 
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
206 206
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
207 207
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
208
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
208
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
209 209
 			);
210 210
 
211 211
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
212 212
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
213
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
213
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
214 214
 			);
215 215
 		}
216 216
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 	{
230 230
 		if ($unix_start_time && $unix_stop_time)
231 231
 		{
232
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
232
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
233 233
 		}
234 234
 
235 235
 		return $this;
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
270 270
 	{
271
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
271
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
272 272
 
273 273
 		return $this;
274 274
 	}
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 	{
337 337
 		if (!empty($column_id))
338 338
 		{
339
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
339
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
340 340
 		}
341 341
 	}
342 342
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 	{
349 349
 		if ($check_visibility)
350 350
 		{
351
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . $this->time();
351
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.$this->time();
352 352
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
353 353
 		}
354 354
 	}
Please login to merge, or discard this patch.