This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 1f15cc0993aebc53870c685836db2eaeafdc767a (commit) from 31a849dd53128b3460f3d6f620a9ca286379e729 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1f15cc0993aebc53870c685836db2eaeafdc767a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 13 15:22:37 2015 +0200
webaccess.cgi: Fix loading language
Fixes #10879
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/webaccess.cgi | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
Difference in files: diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi index b381717..afa3770 100644 --- a/html/cgi-bin/webaccess.cgi +++ b/html/cgi-bin/webaccess.cgi @@ -30,7 +30,6 @@ my $acl_src_noaccess_mac = "$apdir/acls/src_noaccess_mac.acl";
my $banner = "A D V A N C E D P R O X Y - W E B A C C E S S M A N A G E R"; my %cgiparams; -my %mainsettings; my %proxysettings;
my %acl=(); @@ -38,18 +37,10 @@ my @group_defs=(); my @groups=();
### Initialize environment -&readhash("${swroot}/main/settings", %mainsettings); &readhash("${swroot}/proxy/advanced/settings", %proxysettings); -$language = $mainsettings{'LANGUAGE'};
### Initialize language -if ($language =~ /^(\w+)$/) {$language = $1;} - # - # Uncomment this to force a certain language: - # $language='en'; - # -require "${swroot}/langs/en.pl"; -require "${swroot}/langs/${language}.pl"; +require "${swroot}/lang.pl";
&getcgihash(%cgiparams);
hooks/post-receive -- IPFire 2.x development tree