aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-31 03:20:54 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-31 03:20:54 +0000
commit29f583c626d27cba7591238eb70433553cab9219 (patch)
treed1b9e4282e65fe7319303ee38bf30e763b763237
parent8f0890acd10084df5b81da4473a24e2c078f86df (diff)
downloadforums-29f583c626d27cba7591238eb70433553cab9219.tar
forums-29f583c626d27cba7591238eb70433553cab9219.tar.gz
forums-29f583c626d27cba7591238eb70433553cab9219.tar.bz2
forums-29f583c626d27cba7591238eb70433553cab9219.tar.xz
forums-29f583c626d27cba7591238eb70433553cab9219.zip
Minor changes, trying to get it working on my test server
git-svn-id: file:///svn/phpbb/trunk@2993 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions.php9
-rw-r--r--phpBB/install/install.php2
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);