extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed "undefined function lang_select" issue, if no cookies are allowed, also showing again language selection for new installs

Browse Source
This commit is contained in:
Ralf Becker 2011-02-03 02:01:48 +00:00
parent 792e0af077
commit d5a4b78bae
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/check_install.php
View File

@ -876,7 +876,7 @@ if ($run_by_webserver)
echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n"; echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
if(!$ConfigLang) if(!$ConfigLang)
{ {
echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.lang_select(True,'en')."</form></p>\n"; echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True,'en')."</form></p>\n";
} }
echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>'; echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>';
echo '<p>'.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.').'</p>'; echo '<p>'.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.').'</p>';

2
setup/inc/class.setup.inc.php
View File

@ -210,7 +210,7 @@ class setup
{ {
return $ConfigLang; return $ConfigLang;
} }
return 'en'; return null; // not returning 'en', as it suppresses the language selection in check_install and manageheader
} }
/** /**

2
setup/manageheader.php
View File

@ -211,7 +211,7 @@ function show_header_form($validation_errors)
if(!get_var('ConfigLang',array('POST','COOKIE'))) if(!get_var('ConfigLang',array('POST','COOKIE')))
{ {
$setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.lang_select(True,'en')."</form></td></tr>"); $setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True,'en')."</form></td></tr>");
} }
$setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']); $setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']);