Completed
Pull Request — release-2.1 (#4177)
by Jeremy
11:26
created
Sources/Who.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 						'Shitiz "Dragooon" Garg',
591 591
 						'Karl "RegularExpression" Benson',
592 592
 						'Matthew "Labradoodle-360" Kerle',
593
-						$user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge',
593
+						$user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge',
594 594
 						'Michael "Thantos" Miller',
595 595
 						'Norv',
596 596
 						'Peter "Arantor" Spicer',
@@ -814,13 +814,13 @@  discard block
 block discarded – undo
814 814
 			$credit_info = $smcFunc['json_decode']($row['credits'], true);
815 815
 
816 816
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
817
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
817
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
818 818
 			$version = $txt['credits_version'] . ' ' . $row['version'];
819 819
 			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
820 820
 
821 821
 			// build this one out and stash it away
822 822
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
823
-			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license  : '') . (!empty($copyright) ? ' | ' . $copyright  : '');
823
+			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : '');
824 824
 		}
825 825
 		cache_put_data('mods_credits', $mods, 86400);
826 826
 	}
Please login to merge, or discard this patch.
Sources/Attachments.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		// Just send a generic message.
77 77
 		else
78 78
 			$this->setResponse(array(
79
-				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
79
+				'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error',
80 80
 				'type' => 'error',
81 81
 				'data' => false,
82 82
 			));
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 			// Gotta urlencode the filename.
407 407
 			if ($this->_attachResults)
408 408
 				foreach ($this->_attachResults as $k => $v)
409
-					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
409
+					$this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']);
410 410
 
411 411
 			$this->_response = array(
412 412
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 			ob_start();
434 434
 
435 435
 		// Set the header.
436
-		header('Content-Type: application/json; charset='. $context['character_set'] .'');
436
+		header('Content-Type: application/json; charset=' . $context['character_set'] . '');
437 437
 
438 438
 		echo $smcFunc['json_encode']($this->_response ? $this->_response : array());
439 439
 
Please login to merge, or discard this patch.