aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/console/command/user/add.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-12-17 15:55:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-17 15:55:24 +0100
commitdaee389e531c78accdb923e86b1577ecb34ee94c (patch)
tree17f233a613fd81bec246f02571d146741a81cc32 /phpBB/phpbb/console/command/user/add.php
parent5235e6de5358f972382e01a8e399f6e510a02105 (diff)
parent90b7d1fbda7c91c35428c3ec027ca5db9de6cbdf (diff)
downloadforums-daee389e531c78accdb923e86b1577ecb34ee94c.tar
forums-daee389e531c78accdb923e86b1577ecb34ee94c.tar.gz
forums-daee389e531c78accdb923e86b1577ecb34ee94c.tar.bz2
forums-daee389e531c78accdb923e86b1577ecb34ee94c.tar.xz
forums-daee389e531c78accdb923e86b1577ecb34ee94c.zip
Merge pull request #4518 from senky/ticket/14870
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
Diffstat (limited to 'phpBB/phpbb/console/command/user/add.php')
0 files changed, 0 insertions, 0 deletions
39be25ee4d58e8a5615e664'>10020161cca6cbc3d39be25ee4d58e8a5615e664 (diff)downloaddrakx-67fa57fea049bcb27429f921a84cbffdd83faee1.tar
drakx-67fa57fea049bcb27429f921a84cbffdd83faee1.tar.gz
drakx-67fa57fea049bcb27429f921a84cbffdd83faee1.tar.bz2
drakx-67fa57fea049bcb27429f921a84cbffdd83faee1.tar.xz
drakx-67fa57fea049bcb27429f921a84cbffdd83faee1.zip
fix an old typo
Diffstat
-rw-r--r--perl-install/Xconfig/main.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 86ea9ed7c..39de21fb6 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -199,7 +199,7 @@ sub export_to_install_X {
$::o->{X}{default_depth} = $X->{resolution}{Depth};
$::o->{X}{bios_vga_mode} = $X->{resolution}{bios};
$::o->{X}{monitor} = $X->{monitor} if $X->{monitor}{manually_chosen} && $X->{monitor}{vendor} ne "Plug'n Play";
- $::o->{X}{card} = $X->{monitor} if $X->{card}{manually_chosen};
+ $::o->{X}{card} = $X->{card} if $X->{card}{manually_chosen};
$::o->{X}{Xinerama} = 1 if $X->{card}{Xinerama};
}