diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 23:39:01 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 23:39:01 +0200 |
| commit | cdadda35540d4909a00de01c1671251684e2801f (patch) | |
| tree | c16b5e1eb8c3b27ab50550d5219d24f2667391b4 /phpBB/install/database_update.php | |
| parent | 2376f077415814b0a113c1095ad49038e0186a98 (diff) | |
| parent | 41245f9f7ac1f588351ddaa8128b499503416f54 (diff) | |
| download | forums-cdadda35540d4909a00de01c1671251684e2801f.tar forums-cdadda35540d4909a00de01c1671251684e2801f.tar.gz forums-cdadda35540d4909a00de01c1671251684e2801f.tar.bz2 forums-cdadda35540d4909a00de01c1671251684e2801f.tar.xz forums-cdadda35540d4909a00de01c1671251684e2801f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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.php | 1 |
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 . " |