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
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2017-09-07 04:40:46 +0300
committerGitHub <noreply@github.com>2017-09-07 04:40:46 +0300
commit97941db8c8ea36dd36551360ea8ee4d127d595d6 (patch)
treee3d62a8251700e97583150d424557528850b4b95 /plugins/CustomVariables
parent5d90f2e01d9a5ef298300b478d367c14b2adebc5 (diff)
Restore the speed of Visitor Log (#12009)
* render template only if needed * reuse same Twig instance * cache CacheBuster to prevent recalculation when needed multiple times
Diffstat (limited to 'plugins/CustomVariables')
-rw-r--r--plugins/CustomVariables/VisitorDetails.php4
-rw-r--r--plugins/CustomVariables/templates/_visitorDetails.twig6
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/CustomVariables/VisitorDetails.php b/plugins/CustomVariables/VisitorDetails.php
index e90af8e3c1..6be82c6e43 100644
--- a/plugins/CustomVariables/VisitorDetails.php
+++ b/plugins/CustomVariables/VisitorDetails.php
@@ -68,6 +68,10 @@ class VisitorDetails extends VisitorDetailsAbstract
public function renderVisitorDetails($visitInfo)
{
+ if (empty($visitInfo['customVariables'])) {
+ return [];
+ }
+
$view = new View('@CustomVariables/_visitorDetails');
$view->visitInfo = $visitInfo;
return [[ 50, $view->render() ]];
diff --git a/plugins/CustomVariables/templates/_visitorDetails.twig b/plugins/CustomVariables/templates/_visitorDetails.twig
index df26da450d..010f9f7d22 100644
--- a/plugins/CustomVariables/templates/_visitorDetails.twig
+++ b/plugins/CustomVariables/templates/_visitorDetails.twig
@@ -1,5 +1,4 @@
-{% if visitInfo.getColumn('customVariables') %}
- <div class="visitorCustomVariables">
+<div class="visitorCustomVariables">
{% for id,customVariable in visitInfo.getColumn('customVariables') %}
{% set name='customVariableName' ~ id %}
{% set value='customVariableValue' ~ id %}
@@ -9,5 +8,4 @@
</abbr>
{% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %}
{% endfor %}
- </div>
-{% endif %} \ No newline at end of file
+</div> \ No newline at end of file