aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/class_loader.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-02-28 10:42:18 -0500
committerDavid King <imkingdavid@gmail.com>2013-02-28 10:42:18 -0500
commite20da8fb8138d8dbd345d75201cf12fb8ce3d370 (patch)
treef620130fd9a38f7dccd1a24b157186c5d8db857a /phpBB/includes/class_loader.php
parent80bd78a5e5e1069773c05073cd47662a311bda79 (diff)
parentf9cbf5b4c7ea4f4eb1438d98ccc1cb71b0fea2af (diff)
downloadforums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.gz
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.bz2
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.xz
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.zip
Merge remote-tracking branch 'EXreaction/ticket/11369' into develop
# By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11369: [ticket/11369] Reverting migration throws error
Diffstat (limited to 'phpBB/includes/class_loader.php')
0 files changed, 0 insertions, 0 deletions
m>
authorPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:31 +0000
commitb0c38d2b22823e77b9db4cae26464f7bc3c216c7 (patch)
treeba9ee1a6a2df483d4193adff4eea9a218795d33e /perl-install/any.pm
parenta6545c4f0492651acad6d4f77c3708855814f46f (diff)
downloaddrakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.gz
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.bz2
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.xz
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.zip
(get_autologin): adapt to new format of sysconfig/desktop
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0bb1a6dd3..8bd76ea71 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -259,7 +259,8 @@ sub get_autologin {
my ($prefix, $o) = @_;
my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
$o->{autologin} ||= $l{USER};
- $o->{desktop} ||= map { chomp; $_ } cat_("$prefix/etc/sysconfig/desktop");
+ %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+ $o->{desktop} ||= $l{DESKTOP};
}
sub set_autologin {