aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-07-06 19:30:22 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-07-06 19:30:22 +0200
commit24b80d6bd7b3cc9d73d1b207b9b4e2c392738293 (patch)
treea6017fb325b1105d3dc71c4ac2fd10c2b18e5b77
parentbb83af0a0a9589b8fab5e38e847e4372577fedaa (diff)
parent88297726316c4605fb8a605f2b5d3b5ad2c908bc (diff)
downloadforums-24b80d6bd7b3cc9d73d1b207b9b4e2c392738293.tar
forums-24b80d6bd7b3cc9d73d1b207b9b4e2c392738293.tar.gz
forums-24b80d6bd7b3cc9d73d1b207b9b4e2c392738293.tar.bz2
forums-24b80d6bd7b3cc9d73d1b207b9b4e2c392738293.tar.xz
forums-24b80d6bd7b3cc9d73d1b207b9b4e2c392738293.zip
Merge pull request #4375 from bantu/ticket/14692
[ticket/14692] Remove duplicate subexpression in questionnaire.php
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 60e63eddc4..6350f4bc5a 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -190,7 +190,6 @@ class phpbb_questionnaire_system_data_provider
// - 192.168.0.0/16
if ($ip_address_ary[0] == '10' ||
($ip_address_ary[0] == '172' && intval($ip_address_ary[1]) > 15 && intval($ip_address_ary[1]) < 32) ||
- ($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168') ||
($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168'))
{
return true;