Completed
Pull Request — patch_1-1-7 (#3488)
by Spuds
06:27
created
sources/subs/MessageTopicIcons.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 	 * Icons that are default with ElkArte
42 42
 	 * @var array
43 43
 	 */
44
-	protected $_stable_icons = 	array();
44
+	protected $_stable_icons = array();
45 45
 
46 46
 	/**
47 47
 	 * Icons to load in addition to the default
Please login to merge, or discard this patch.
sources/subs/BoardsList.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -369,7 +369,7 @@
 block discarded – undo
369 369
 			if ($row_board['subject'] != '')
370 370
 			{
371 371
 				$this_last_post['href'] = $this->_scripturl . '?topic=' . $row_board['id_topic'] . '.msg' . ($this->_user['is_guest'] ? $row_board['id_msg'] : $row_board['new_from']) . (empty($row_board['is_read']) ? ';boardseen' : '') . '#new';
372
-				$this_last_post['link'] = '<a href="' . $this_last_post['href'] . '" title="' . Util::htmlspecialchars($row_board['subject']). '">' . $row_board['short_subject'] . '</a>';
372
+				$this_last_post['link'] = '<a href="' . $this_last_post['href'] . '" title="' . Util::htmlspecialchars($row_board['subject']) . '">' . $row_board['short_subject'] . '</a>';
373 373
 				/* The board's and children's 'last_post's have:
374 374
 				time, timestamp (a number that represents the time.), id (of the post), topic (topic id.),
375 375
 				link, href, subject, start (where they should go for the first unread post.),
Please login to merge, or discard this patch.
sources/subs/Unread.class.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 	 */
359 359
 	private function _getUnreadReplies($start, $limit, $include_avatars = false)
360 360
 	{
361
-        $request = $this->_db->query('unread_replies', '
361
+		$request = $this->_db->query('unread_replies', '
362 362
 				SELECT DISTINCT t.id_topic
363 363
 				FROM {db_prefix}topics AS t
364 364
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($this->_sort_query, 'ms.') === false ? '' : '
@@ -369,19 +369,19 @@  discard block
 block discarded – undo
369 369
 				WHERE t.id_board IN ({array_int:boards})
370 370
 					AND t.id_last_msg >= {int:min_message}
371 371
 					AND COALESCE(lt.id_msg, lmr.id_msg, 0) < t.id_last_msg' .
372
-            ($this->_post_mod ? ' AND t.approved = {int:is_approved}' : '') .
373
-            ($this->_unwatch ? ' AND COALESCE(lt.unwatched, 0) != 1' : '') . '
372
+			($this->_post_mod ? ' AND t.approved = {int:is_approved}' : '') .
373
+			($this->_unwatch ? ' AND COALESCE(lt.unwatched, 0) != 1' : '') . '
374 374
 				ORDER BY {raw:order}
375 375
 				LIMIT {int:offset}, {int:limit}',
376
-            array_merge($this->_query_parameters, array(
377
-                'current_member' => $this->_user_id,
378
-                'min_message' => $this->_min_message,
379
-                'is_approved' => 1,
380
-                'order' => $this->_sort_query . ($this->_ascending ? '' : ' DESC'),
381
-                'offset' => $start,
382
-                'limit' => $limit,
383
-            ))
384
-        );
376
+			array_merge($this->_query_parameters, array(
377
+				'current_member' => $this->_user_id,
378
+				'min_message' => $this->_min_message,
379
+				'is_approved' => 1,
380
+				'order' => $this->_sort_query . ($this->_ascending ? '' : ' DESC'),
381
+				'offset' => $start,
382
+				'limit' => $limit,
383
+			))
384
+		);
385 385
 
386 386
 		$topics = array();
387 387
 		while ($row = $this->_db->fetch_assoc($request))
Please login to merge, or discard this patch.
sources/subs/Mail.subs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1416,7 +1416,7 @@
 block discarded – undo
1416 1416
 
1417 1417
 			// If it sent, keep a record so we can save it in our allowed to reply log
1418 1418
 			if (!empty($unq_head) && $result)
1419
-				$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
1419
+				$sent[] = array_merge($unq_head_array, array(time(), $email['to']));
1420 1420
 
1421 1421
 			// Track total emails sent
1422 1422
 			if ($result && !empty($modSettings['trackStats']))
Please login to merge, or discard this patch.
sources/subs/Topic.subs.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1591,7 +1591,7 @@  discard block
 block discarded – undo
1591 1591
 	$db = database();
1592 1592
 
1593 1593
 	// Get the messages and stick them into an array.
1594
-    $request = $db->query('', '
1594
+	$request = $db->query('', '
1595 1595
 		SELECT 
1596 1596
 			m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name, m.poster_time, m.body, 
1597 1597
 			m.id_msg, m.smileys_enabled, m.id_member 
@@ -1610,17 +1610,17 @@  discard block
 block discarded – undo
1610 1610
 		JOIN {db_prefix}messages as m ON o.id_msg=m.id_msg 
1611 1611
 		LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
1612 1612
 		ORDER BY m.id_msg DESC',
1613
-        array(
1614
-            'current_topic' => $topic,
1615
-            'no_split_msgs' => !empty($messages['excluded']) ? $messages['excluded'] : array(),
1616
-            'split_msgs' => !empty($messages['included']) ? $messages['included'] : array(),
1617
-            'is_approved' => 1,
1618
-            'start' => $start,
1619
-            'messages_per_page' => $items_per_page,
1620
-            'msg_before' => !empty($messages['before']) ? (int) $messages['before'] : 0,
1621
-            'msg_after' => !empty($messages['after']) ? (int) $messages['after'] : 0,
1622
-        )
1623
-    );
1613
+		array(
1614
+			'current_topic' => $topic,
1615
+			'no_split_msgs' => !empty($messages['excluded']) ? $messages['excluded'] : array(),
1616
+			'split_msgs' => !empty($messages['included']) ? $messages['included'] : array(),
1617
+			'is_approved' => 1,
1618
+			'start' => $start,
1619
+			'messages_per_page' => $items_per_page,
1620
+			'msg_before' => !empty($messages['before']) ? (int) $messages['before'] : 0,
1621
+			'msg_after' => !empty($messages['after']) ? (int) $messages['after'] : 0,
1622
+		)
1623
+	);
1624 1624
 
1625 1625
 	$messages = array();
1626 1626
 	$parser = \BBC\ParserWrapper::instance();
@@ -2176,9 +2176,9 @@  discard block
 block discarded – undo
2176 2176
 	);
2177 2177
 
2178 2178
 	// When evaluating potentially huge offsets, grab the ids only, first.
2179
-    // The performance impact is still significant going from three columns to one.
2179
+	// The performance impact is still significant going from three columns to one.
2180 2180
 	$postMod = $modSettings['postmod_active'] && allowedTo('approve_posts');
2181
-    $request = $db->query('display_get_post_poster', '
2181
+	$request = $db->query('display_get_post_poster', '
2182 2182
 		SELECT 
2183 2183
 			m.id_msg, m.id_member
2184 2184
 		FROM (
@@ -2191,13 +2191,13 @@  discard block
 block discarded – undo
2191 2191
 			LIMIT ' . $limit['start'] . ', ' . $limit['offset']) . ') AS o 
2192 2192
 		JOIN {db_prefix}messages as m ON o.id_msg=m.id_msg
2193 2193
 		ORDER BY m.id_msg ' . ($sort ? '' : 'DESC'),
2194
-        array(
2195
-            'current_member' => $user_info['id'],
2196
-            'current_topic' => $topic,
2197
-            'is_approved' => 1,
2198
-            'blank_id_member' => 0,
2199
-        )
2200
-    );
2194
+		array(
2195
+			'current_member' => $user_info['id'],
2196
+			'current_topic' => $topic,
2197
+			'is_approved' => 1,
2198
+			'blank_id_member' => 0,
2199
+		)
2200
+	);
2201 2201
 	while ($row = $db->fetch_assoc($request))
2202 2202
 	{
2203 2203
 		if (!empty($row['id_member']))
Please login to merge, or discard this patch.
sources/controllers/Notify.controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -425,7 +425,7 @@
 block discarded – undo
425 425
 		if ($valid)
426 426
 		{
427 427
 			$this->_unsubscribeToggle($member, $area, $extra);
428
-			$this->_prepareTemplateMessage( $area, $extra, $member['email_address']);
428
+			$this->_prepareTemplateMessage($area, $extra, $member['email_address']);
429 429
 
430 430
 			return true;
431 431
 		}
Please login to merge, or discard this patch.
sources/subs/VerificationControls.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	// Need GD for CAPTCHA images
30 30
 	if (in_array('gd', get_loaded_extensions()))
31 31
 	{
32
-		array_unshift($known_verifications,'captcha');
32
+		array_unshift($known_verifications, 'captcha');
33 33
 	}
34 34
 
35 35
 	// Let integration add some more controls
Please login to merge, or discard this patch.
sources/subs/Admin.subs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
 		'file_versions_subs' => SUBSDIR,
242 242
 		'file_versions_modules' => SOURCEDIR . '/modules',
243 243
 	);
244
-	$tmp_version_info = array_combine(array_keys($directories),array_fill(0,count($directories),array()));
244
+	$tmp_version_info = array_combine(array_keys($directories), array_fill(0, count($directories), array()));
245 245
 	readFileVersions($tmp_version_info, $directories, '.php', true);
246 246
 
247 247
 	foreach ($tmp_version_info['file_versions_subs'] as $key => $val)
Please login to merge, or discard this patch.
sources/controllers/PersonalMessage.controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1859,7 +1859,7 @@
 block discarded – undo
1859 1859
 		global $txt, $context, $user_info, $language, $modSettings;
1860 1860
 
1861 1861
 		// Check that this feature is even enabled!
1862
-		$pmsg_check = $this->_req->getPost('pmsg', 'intval',  $this->_req->getQuery('pmsg', 'intval', 0));
1862
+		$pmsg_check = $this->_req->getPost('pmsg', 'intval', $this->_req->getQuery('pmsg', 'intval', 0));
1863 1863
 		if (empty($modSettings['enableReportPM']) || empty($pmsg_check))
1864 1864
 		{
1865 1865
 			throw new Elk_Exception('no_access', false);
Please login to merge, or discard this patch.