Completed
Push — develop ( 92ad0e...9ed6be )
by Daniel
12:37
created
services/users/data.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
 		if (sizeof($query_ids))
77 77
 		{
78
-			$sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids);
78
+			$sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids);
79 79
 			$this->query($sql_where);
80 80
 		}
81 81
 
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	public function get_profile_fields()
151 151
 	{
152 152
 		$sql = 'SELECT l.lang_name, f.field_ident
153
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
154
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
153
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
154
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
155 155
 				AND f.field_active = 1
156 156
 				AND f.field_no_view = 0
157 157
 				AND f.field_hide = 0
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 	 */
204 204
 	protected function get_search_url($user_id)
205 205
 	{
206
-		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : '';
206
+		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : '';
207 207
 	}
208 208
 
209 209
 	/**
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	{
215 215
 		if (!function_exists('phpbb_get_user_rank'))
216 216
 		{
217
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
217
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
218 218
 		}
219 219
 
220 220
 		$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
@@ -288,8 +288,8 @@  discard block
 block discarded – undo
288 288
 	protected function get_sql_statement($sql_where = '', $order_by = '')
289 289
 	{
290 290
 		return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason
291
-			FROM ' . USERS_TABLE .
292
-			(($sql_where) ? ' WHERE ' . $sql_where : '') .
293
-			(($order_by) ? ' ORDER BY ' . $order_by : '');
291
+			FROM ' . USERS_TABLE.
292
+			(($sql_where) ? ' WHERE '.$sql_where : '').
293
+			(($order_by) ? ' ORDER BY '.$order_by : '');
294 294
 	}
295 295
 }
Please login to merge, or discard this patch.
services/util.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function get_default_avatar()
106 106
 	{
107
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
107
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
108 108
 	}
109 109
 
110 110
 	/**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function get_theme_path()
115 115
 	{
116
-		return "{$this->web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
116
+		return "{$this->web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
117 117
 	}
118 118
 
119 119
 	/**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	protected function set_corrected_paths()
149 149
 	{
150 150
 		// Determine board url - we may need it later
151
-		$board_url = generate_board_url() . '/';
151
+		$board_url = generate_board_url().'/';
152 152
 
153 153
 		$corrected_path = $this->path_helper->get_web_root_path();
154 154
 		$this->web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
Please login to merge, or discard this patch.
blocks/member_menu.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 				'USER_POSTS'	=> $this->user->data['user_posts'],
69 69
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
70 70
 
71
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&amp;u=' . $this->user->data['user_id']),
72
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
73
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
74
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&amp;folder=inbox'),
75
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
71
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&amp;u='.$this->user->data['user_id']),
72
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
73
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
74
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&amp;folder=inbox'),
75
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
76 76
 				'U_MCP' 		=> $this->get_mcp_url(),
77 77
 				'U_ACP'			=> $this->get_acp_url(),
78 78
 			));
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	protected function get_mcp_url()
101 101
 	{
102
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
102
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
103 103
 	}
104 104
 
105 105
 	/**
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	protected function get_acp_url()
109 109
 	{
110
-		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
110
+		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
111 111
 	}
112 112
 
113 113
 	/**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				POSTS_TABLE		=> 'p',
121 121
 			),
122 122
 			'WHERE'		=> array(
123
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
123
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
124 124
 			),
125 125
 		);
126 126
 
Please login to merge, or discard this patch.