Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2012-02-08 03:23:35 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-02-08 03:23:35 +0400
commitad66087e6d30fbb10a823e16a2845039939f308d (patch)
treeb85294f487592e97a47afc4699ad8d77cf22195f /config
parentaf24abdbe12e54b0f8208c7d3b340ccbbbc3c588 (diff)
Fixes #2902
* removed ip_address_pre_mask_length setting -- now there is only one setting which anonymises after testing for IP exclusion * Reverted the "synchronize" from [5772] since not needed anymore * Added integration test to test that IP is indeed anonymized * Added integration test to test that IP is anonymized AFTER testing for ip exclusion git-svn-id: http://dev.piwik.org/svn/trunk@5776 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index 4e1466c780..6fe392aa5f 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -339,12 +339,7 @@ campaign_keyword_var_name = "pk_kwd,piwik_kwd,utm_term"
; maximum length of a Page Title or a Page URL recorded in the log_action.name table
page_maximum_length = 1024;
-; Anonymize a visitor's IP address before any tracking heuristics or any plugins can access the visitor's IP address;
-; This value is the number of octets in IP address to mask; if the AnonymizeIP plugin is deactivated, this value is ignored.
-; For IPv4 addresses, valid values are 0..4; for IPv6 addresses, valid values are 0..16
-ip_address_pre_mask_length = 0
-
-; Anonymize a visitor's IP address after tracking heuristics but before storing to DB;
+; Anonymize a visitor's IP address after testing for "Ip exclude"
; This value is the number of octets in IP address to mask; if the AnonymizeIP plugin is deactivated, this value is ignored.
; For IPv4 addresses, valid values are 0..4; for IPv6 addresses, valid values are 0..16
ip_address_mask_length = 1