aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-09-16 23:38:50 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-09-16 23:38:50 +0200
commit41245f9f7ac1f588351ddaa8128b499503416f54 (patch)
tree85469583e9b374dc26ced337f61c673e67b5be90 /phpBB/install/database_update.php
parented783506c6775cb73813261d3c29ae8e0652c4e8 (diff)
parente5d5d581727ce61e653fdfc9a30effb69799aac5 (diff)
downloadforums-41245f9f7ac1f588351ddaa8128b499503416f54.tar
forums-41245f9f7ac1f588351ddaa8128b499503416f54.tar.gz
forums-41245f9f7ac1f588351ddaa8128b499503416f54.tar.bz2
forums-41245f9f7ac1f588351ddaa8128b499503416f54.tar.xz
forums-41245f9f7ac1f588351ddaa8128b499503416f54.zip
Merge branch 'ticket/bantu/9091' into develop-olympus
* ticket/bantu/9091: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8fd96691d9..ca4ef817be 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -119,6 +119,7 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
unset($dbpasswd);
$user->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
+$user->ip = (stripos($user->ip, '::ffff:') === 0) ? substr($user->ip, 7) : $user->ip;
$sql = "SELECT config_value
FROM " . CONFIG_TABLE . "