aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration/data/v31x/v314rc2.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-04-28 22:17:51 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-04-28 22:17:51 +0200
commit39f1e8c009e35caac4e6490e4f94333c8571f57b (patch)
treeb4c07ecef4b82a731982941555da055d344dc60f /phpBB/phpbb/db/migration/data/v31x/v314rc2.php
parentae2707db1341b8150dbbadde93aa847f15ba3ef2 (diff)
parent95add752b74bf8c24f88e81799aa0f43341ea90b (diff)
downloadforums-39f1e8c009e35caac4e6490e4f94333c8571f57b.tar
forums-39f1e8c009e35caac4e6490e4f94333c8571f57b.tar.gz
forums-39f1e8c009e35caac4e6490e4f94333c8571f57b.tar.bz2
forums-39f1e8c009e35caac4e6490e4f94333c8571f57b.tar.xz
forums-39f1e8c009e35caac4e6490e4f94333c8571f57b.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
Diffstat (limited to 'phpBB/phpbb/db/migration/data/v31x/v314rc2.php')
0 files changed, 0 insertions, 0 deletions
>perl-install/mouse.pm parent2217db2d8f69a6800b63756da7b49e85388ca593 (diff)downloaddrakx-fff0fecf10c98f77bdefcea0254fe2f03f8b1c34.tar
drakx-fff0fecf10c98f77bdefcea0254fe2f03f8b1c34.tar.gz
drakx-fff0fecf10c98f77bdefcea0254fe2f03f8b1c34.tar.bz2
drakx-fff0fecf10c98f77bdefcea0254fe2f03f8b1c34.tar.xz
drakx-fff0fecf10c98f77bdefcea0254fe2f03f8b1c34.zip
define and use $o->{mouse}{alternate_install} if detected mouse can't be used during install
Diffstat (limited to 'perl-install/mouse.pm')
-rw-r--r--perl-install/mouse.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 55067cad6..84714e2db 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -292,8 +292,8 @@ sub detect {
my $synaptics_mouse;
if (my $mouse_nb = grep { /^H: Handlers=mouse/ } @input_devices) {
my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom);
- $::isInstall && !$::o->{mouse} and return $univ_mouse; #- don't try to use synpatics at beginning of install
if (any { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) {
+ $::isInstall && $synaptics->{alternate_install} = $univ_mouse; #- don't try to use synpatics at beginning of install
$synaptics_mouse = fullname2mouse('PS/2|Synaptics Touchpad');
$mouse_nb < 2 and return $synaptics_mouse;
$univ_mouse->{auxmouse} = $synaptics_mouse;