* Removing |count as I didn't notice |length was already used

Refs #4019
matomo-org · Jun 30, 2013 · affa786 · affa786
1 parent 6355922
commit affa786
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/core/Twig.php b/core/Twig.php
@@ -53,7 +53,6 @@ public function __construct($theme = self::DEFAULT_THEME)
         $this->addFilter_money();
         $this->addFilter_truncate();
         $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode'));
-        $this->twig->addFilter( new Twig_SimpleFilter('count', 'count'));
         /*
         $this->load_filter('output', 'cachebuster');
         $this->load_filter('output', 'trimwhitespace');*/

diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
@@ -19,30 +19,30 @@
     * {{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}
 
 {% else %}
-{% if warningMessages|count > 0 %}
+{% if warningMessages|length > 0 %}
     [!] {{ 'CoreUpdater_WarningMessages'|translate }}
 
     {% for message in warningMessages -%}
     * {{ message }}
     {%- endfor %}
 {%- endif %}
-{% if errorMessages|count > 0 -%}
+{% if errorMessages|length > 0 -%}
 
     [X] {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
 
     {% for message in errorMessages %}
     * {{ message }}
     {% endfor %}
 
-    {% if deactivatedPlugins|count > 0 -%}
+    {% if deactivatedPlugins|length > 0 -%}
     {%  set listOfDeactivatedPlugins %}{{ deactivatedPlugins|implode(', ') }}{% endset %}
 
     [!] {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
     {% endif %}
 
 {% endif %}
 
-{% if errorMessages|count > 0 or warningMessages|count > 0 %}
+{% if errorMessages|length > 0 or warningMessages|length > 0 %}
     {{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}
 
     * {{ helpMessage }}

diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
@@ -16,7 +16,7 @@
 
     * {{ helpMessage }}
 
-{% elseif coreToUpdate or pluginNamesToUpdate|count > 0 %}
+{% elseif coreToUpdate or pluginNamesToUpdate|length > 0 %}
 
     {{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}
 
@@ -26,7 +26,7 @@
         {{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
     {% endif %}
 
-    {% if pluginNamesToUpdate|count > 0 %}
+    {% if pluginNamesToUpdate|length > 0 %}
         {%- set listOfPlugins %}{{  pluginNamesToUpdate|implode(', ') }}{% endset %}
         {{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
     {%  endif %}