From 29f583c626d27cba7591238eb70433553cab9219 Mon Sep 17 00:00:00 2001
From: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>
Date: Thu, 31 Oct 2002 03:20:54 +0000
Subject: [PATCH] Minor changes, trying to get it working on my test server

git-svn-id: file:///svn/phpbb/trunk@2993 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 9 ++++++---
 phpBB/install/install.php    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6cfbd9db8f..c85f2c0c61 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -331,13 +331,16 @@ function language_select($default, $select_name = "language", $dirname="language
 	$user = array();
 	while ( $file = readdir($dir) )
 	{
-		if ( file_exists($dirname . '/' . $file . '/iso.txt') )
+		if (!is_dir($dirname . '/' . $file))
+		{
+			continue;
+		}
+		if ( @file_exists($dirname . '/' . $file . '/iso.txt') )
 		{
 			list($displayname) = file($dirname . '/' . $file . '/iso.txt');
-			$lang[$displayname] = $dirname . '/' . $file;
+			$lang[$displayname] = $file;
 		}
 	}
-
 	@closedir($dir);
 
 	@asort($lang);
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index d748aa0c25..6f63df22cf 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -536,7 +536,7 @@ else
 			);
 			$template->pparse('body');				*/
 
-			exit;
+			die("Error during installation: no $check_exts extension");
 		}
 
 		include($phpbb_root_path . 'db/' . $dbms . '.' . $phpEx);