Do not use device type as XML tag name (#12190)

2 files changed, 14 insertions, 6 deletions

diff --git a/plugins/DevicesDetection/VisitorDetails.php b/plugins/DevicesDetection/VisitorDetails.php
index d358c2d1ef..5b17fdc4e6 100644
--- a/plugins/DevicesDetection/VisitorDetails.php
+++ b/plugins/DevicesDetection/VisitorDetails.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\DevicesDetection;
 
 use Piwik\Plugins\Live\VisitorDetailsAbstract;
@@ -151,7 +152,7 @@ class VisitorDetails extends VisitorDetailsAbstract
     public function finalizeProfile($visits, &$profile)
     {
         $devices = $this->devices;
-        uksort($this->devices, function($a, $b) use ($devices) {
+        uksort($this->devices, function ($a, $b) use ($devices) {
             $cmp = strcmp($devices[$b]['count'], $devices[$a]['count']);
             if (0 == $cmp) {
                 $cmp = strcmp($a, $b);
@@ -159,6 +160,8 @@ class VisitorDetails extends VisitorDetailsAbstract
             return $cmp;
         });
 
+        $devices = [];
+
         foreach ($this->devices as $type => $devicesData) {
             $typeDevices = [];
             foreach ($devicesData['devices'] as $name => $count) {
@@ -167,9 +170,14 @@ class VisitorDetails extends VisitorDetailsAbstract
                     'count' => $count
                 ];
             }
-            $this->devices[$type]['devices'] = $typeDevices;
+            $devices[] = [
+                'type'    => $type,
+                'count'   => $devicesData['count'],
+                'icon'    => $devicesData['icon'],
+                'devices' => $typeDevices,
+            ];
         }
 
-        $profile['devices'] = $this->devices;
+        $profile['devices'] = $devices;
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/templates/_profileSummary.twig b/plugins/DevicesDetection/templates/_profileSummary.twig
index 05348864c5..b124302684 100644
--- a/plugins/DevicesDetection/templates/_profileSummary.twig
+++ b/plugins/DevicesDetection/templates/_profileSummary.twig
@@ -2,13 +2,13 @@
     <div class="visitor-profile-summary visitor-profile-devices">
         <h1>{{ 'DevicesDetection_Devices'|translate }}</h1>
         <div>
-            {%- for type,entry in visitorData.devices -%}
+            {%- for entry in visitorData.devices -%}
                 <p>
                     <img height="16" src="{{ entry.icon }}" />
                     {% if entry.devices|length == 1 and 'General_Unknown'|translate in entry.devices[0].name %}
-                        <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ type ~ '</strong>')|raw }}
+                        <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ entry.type ~ '</strong>')|raw }}
                     {% else %}
-                    <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ type ~ '</strong>')|raw }}:
+                    <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ entry.type ~ '</strong>')|raw }}:
                         {% for device in entry.devices -%}
                             {{ device.name }} ({{ device.count }}x){% if not loop.last %}, {% endif %}
                         {%- endfor -%}