From d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 28 Feb 2002 14:17:19 +0000 Subject: [PATCH] Slight mod to language selector to handle double underscored lang files git-svn-id: file:///svn/phpbb/trunk@2219 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 53d7a365ac..f75a9ad941 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -621,8 +621,9 @@ function language_select($default, $select_name = "language", $dirname="language { if ( ereg("^lang_", $file) && !is_file($dirname . "/" . $file) && !is_link($dirname . "/" . $file) ) { - $filename = str_replace("lang_", "", $file); - $displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename); + $filename = trim(str_replace("lang_", "", $file)); + $displayname = preg_replace("/^(.*?)_(.*)$/", "\\1 [ \\2 ]", $filename); + $displayname = preg_replace("/\[(.*?)_(.*)\]/", "[ \\1 - \\2 ]", $displayname); $lang[$displayname] = $filename; } }