diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-06-24 13:47:59 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-06-24 13:47:59 +0400 |
| commit | c263308d8229735c04b7aeacf4c224f0a5b866d2 (patch) | |
| tree | e0df779805527709f86f682eaf8b70f23218243a /plugins/CoreHome/templates/_headerMessage.twig | |
| parent | 0b83450ed5b8d6f278f4266347e2ab9736c62bd1 (diff) | |
See the branch 2.x-twig for list of commits on twig... Kuddos @halfdan for your work!
Here are some updates:
* Removing |raw from the codebase.
* Disabling autoescape by default (in Twig_Environment constructor: 'autoescape' => false )
* Adding |e('html') where html entities are needed
* Fixing parse error in goals
Diffstat (limited to 'plugins/CoreHome/templates/_headerMessage.twig')
| -rw-r--r-- | plugins/CoreHome/templates/_headerMessage.twig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index c929db3c03..9a157225cc 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -17,17 +17,17 @@ {% if piwikUrl == 'http://demo.piwik.org/' %} {{ 'General_YouAreViewingDemoShortMessage'|translate }} <br/> - {{ 'General_DownloadFullVersion'|translate("<a href='http://piwik.org/'>","</a>","<a href='http://piwik.org'>piwik.org</a>")|raw }} + {{ 'General_DownloadFullVersion'|translate("<a href='http://piwik.org/'>","</a>","<a href='http://piwik.org'>piwik.org</a>") }} {% elseif latest_version_available %} {% if isSuperUser %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>") }} <br/> {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>{{ latest_version_available }}</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>{{ latest_version_available }}</a>") }} {% endif %} {% else %} - {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",piwik_version+"</a>","<br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>",'<br/>',"<a href='http://piwik.org/donate/' target='_blank'><strong><em>","</em></strong></a>")|raw }} + {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",piwik_version+"</a>","<br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>",'<br/>',"<a href='http://piwik.org/donate/' target='_blank'><strong><em>","</em></strong></a>") }} {% endif %} {% if hasSomeAdminAccess %} <br/> |