From eba779cb35bb14d62daeb79f319c6055ea71bffa Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Sun, 29 Jun 2003 11:35:55 +0000
Subject: [PATCH] There is no default_language ...

git-svn-id: file:///svn/phpbb/trunk@4185 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install.php | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index bb0713c6ca..5582a3af20 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -175,28 +175,23 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$language)
 			}
 		}
 	}
-
-	// No appropriate language found ... so let's use the first one in the language
-	// dir, this may or may not be English
-	if (!$language)
-	{
-		$dir = @opendir($phpbb_root_path . 'language');
-		while ($file = readdir($dir))
-		{
-			$path = $phpbb_root_path . 'language/' . $file;
-
-			if (!is_file($path) && !is_link($path) && file_exists($path . '/iso.txt'))
-			{
-				$language = $file;
-				break;
-			}
-		}
-	}
 }
 
+// No appropriate language found ... so let's use the first one in the language
+// dir, this may or may not be English
 if (!$language)
 {
-	$language = $default_language;
+	$dir = @opendir($phpbb_root_path . 'language');
+	while ($file = readdir($dir))
+	{
+		$path = $phpbb_root_path . 'language/' . $file;
+
+		if (!is_file($path) && !is_link($path) && file_exists($path . '/iso.txt'))
+		{
+			$language = $file;
+			break;
+		}
+	}
 }
 
 include($phpbb_root_path . 'language/' . $language . '/lang_main.'.$phpEx);