Merge pull request #932 from AgID/develop

Consolidation in master
AgID · Mar 20, 2021 · 25eb0ba · 25eb0ba
2 parents 76af75f + 69c51bb
commit 25eb0ba
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/app/Http/Controllers/WebsiteController.php b/app/Http/Controllers/WebsiteController.php
@@ -231,7 +231,7 @@ public function show(PublicAdministration $publicAdministration, Website $websit
         $usersPermissionsDatatable = $this->getDatatableUsersPermissionsParams($usersPermissionsDatatableSourceUrl, true);
 
         $authUser = auth()->user();
-        $userPublicAdministrationStatus = $authUser->getStatusforPublicAdministration($publicAdministration);
+        $userPublicAdministrationStatus = $authUser->getStatusforPublicAdministration($currentPublicAdministration);
 
         $forceActivationButtonVisible = !app()->environment('production') && config('wai.custom_public_administrations', false) && $website->type->is(WebsiteType::INSTITUTIONAL_PLAY);
 

diff --git a/app/Traits/InteractsWithRedisIndex.php b/app/Traits/InteractsWithRedisIndex.php
@@ -202,7 +202,7 @@ protected function searchRedisIndex(string $indexName, string $query, array $opt
 
     protected function escapeQuery(string $query)
     {
-        return preg_replace('/([\@\!\{\}\(\)\|\-\=\>\*\.])/', '\\\\$1', $query);
+        return preg_replace('/([\@\!\{\}\(\)\|\-\=\>\*\.\:])/', '\\\\$1', $query);
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "italia/wai-portal",
     "description": "Web Analytics Italia",
-    "version": "1.6.1-beta",
+    "version": "1.6.2-beta",
     "keywords": ["analytics", "italia"],
     "license": "AGPL-3.0-or-later",
     "type": "project",

diff --git a/composer.lock b/composer.lock
diff --git a/containers/matomo/config.ini.php b/containers/matomo/config.ini.php
@@ -37,6 +37,7 @@
 default_language = "it"
 archiving_custom_ranges[] = previous30
 enable_processing_unique_visitors_range = 1
+enable_processing_unique_visitors_multiple_sites = 1
 anonymous_user_enable_use_segments_API = 0
 enable_create_realtime_segments = 0
 enable_segment_suggested_values = 0
-Original file line number
+Diff line change
@@ Expand Up @@
         protected function escapeQuery(string $query)
         {
-            return preg_replace('/([\@\!\{\}\(\)\|\-\=\>\*\.])/', '\\\\$1', $query);
+            return preg_replace('/([\@\!\{\}\(\)\|\-\=\>\*\.\:])/', '\\\\$1', $query);
         }
         /**
@@ Expand Down @@