2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 68bf1f9a84..7db99eb56a 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1704,7 +1704,12 @@ class install_install extends module
 		{
 			$path = $phpbb_root_path . 'language/' . $file;
 
-			if (is_dir($path) && !is_link($path) && file_exists($path . '/iso.txt'))
+			if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS')
+			{
+				continue;
+			}
+
+			if (is_dir($path) && file_exists($path . '/iso.txt'))
 			{
 				$lang_file = file("{$phpbb_root_path}language/$path/iso.txt");
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 4c4912a2ab..0659e1f364 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -454,7 +454,7 @@ class install_update extends module
 									{
 										if (substr(strrchr($entry, '.'), 1) == 'css')
 										{
-											$file_list[] = $entry;
+											$file_list[] = "{$phpbb_root_path}styles/{$theme['theme_path']}/theme/{$entry}";
 										}
 									}
 									closedir($dir);