diff --git a/phpBB/cron.php b/phpBB/cron.php
index 3cba9e3f5e..324437d812 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -118,7 +118,7 @@ switch ($cron_type)
 	break;
 
 	case 'tidy_search':
-		
+
 		// Select the search method
 		$search_type = basename($config['search_type']);
 
diff --git a/phpBB/style.php b/phpBB/style.php
index 3ee1726554..9f8d8ff4d3 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -82,7 +82,7 @@ $user_image_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_p
 $sql = 'SELECT *
 	FROM ' . STYLES_IMAGESET_DATA_TABLE . '
 	WHERE imageset_id = ' . $theme['imageset_id'] . "
-	AND image_filename <> '' 
+	AND image_filename <> ''
 	AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')";
 $result = $db->sql_query($sql, 3600);
 
@@ -222,7 +222,7 @@ if (isset($matches[0]) && sizeof($matches[0]))
 			case 'SRC':
 				$replace[] = $imgs[$img]['src'];
 			break;
-			
+
 			case 'WIDTH':
 				$replace[] = $imgs[$img]['width'];
 			break;
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 67032a061e..960eee4b65 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -138,7 +138,7 @@ while ($row = $db->sql_fetchrow($result))
 	{
 		$view_online = $s_user_hidden = false;
 		$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
-		
+
 		$username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
 
 		if (!$row['session_viewonline'])
@@ -334,7 +334,7 @@ while ($row = $db->sql_fetchrow($result))
 		'U_USER_IP'			=> append_sid('viewonline', 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&amp;s=' . $row['session_id'] : '') . "&amp;sg=$show_guests&amp;start=$start&amp;sk=$sort_key&amp;sd=$sort_dir"),
 		'U_WHOIS'			=> append_sid('viewonline', 'mode=whois&amp;s=' . $row['session_id']),
 		'U_FORUM_LOCATION'	=> $location_url,
-		
+
 		'S_USER_HIDDEN'		=> $s_user_hidden,
 		'S_GUEST'			=> ($row['user_id'] == ANONYMOUS) ? true : false,
 		'S_USER_TYPE'		=> $row['user_type'],
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 19d0f7a732..07ab9c9749 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -453,7 +453,7 @@ if ($start < 0 || $start > $total_posts)
 
 // General Viewtopic URL for return links
 $viewtopic_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;start=$start" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($highlight_match) ? "&amp;hilit=$highlight" : ''));
- 
+
 // Are we watching this topic?
 $s_watching_topic = array(
 	'link'			=> '',