From 0232067cbc689ca53917cda0fd6c4ea60c9d6bf2 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 25 Jun 2013 22:17:07 +1200
Subject: [PATCH]  * Fixing Users manager Refs #4019

---
 plugins/CoreHome/templates/_siteSelect.twig       | 2 +-
 plugins/UsersManager/javascripts/usersSettings.js | 3 ++-
 plugins/UsersManager/templates/userSettings.twig  | 2 +-
 plugins/Zeitgeist/templates/admin.twig            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/CoreHome/templates/_siteSelect.twig b/plugins/CoreHome/templates/_siteSelect.twig
index 2f3464fb9b2..80d337828bb 100644
--- a/plugins/CoreHome/templates/_siteSelect.twig
+++ b/plugins/CoreHome/templates/_siteSelect.twig
@@ -40,7 +40,7 @@
                 <ul class="custom_select_ul_list">
                     {% for info in sites %}
                         <li {% if (showSelectedSite is not defined or showSelectedSite == false) and idSite == info.idsite %} style="display: none"{% endif %}>
-                            <a href="#" siteid="{{ info.idsite }}">{{ info.name }}</a>
+                            <a href="#" siteid="{{ info.idsite }}">{{ info.name|raw }}</a>
                         </li>
                     {% endfor %}
                 </ul>
diff --git a/plugins/UsersManager/javascripts/usersSettings.js b/plugins/UsersManager/javascripts/usersSettings.js
index 5708ca7a72d..4c05a46478c 100644
--- a/plugins/UsersManager/javascripts/usersSettings.js
+++ b/plugins/UsersManager/javascripts/usersSettings.js
@@ -22,8 +22,9 @@ function sendUserSettingsAJAX() {
     var password = $('#password').val();
     var passwordBis = $('#passwordBis').val();
     var defaultReport = $('input[name=defaultReport]:checked').val();
+
     if (defaultReport == 1) {
-        defaultReport = $('#defaultReportSiteSelector').find('.custom_select_main_link').attr('siteid');
+        defaultReport = $('#userSettingsTable').find('.custom_select_main_link').attr('siteid');
     }
     var postParams = {};
     postParams.alias = alias;
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index d52c2ea6eba..dd5d3327d06 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -106,7 +106,7 @@
 {% endif %}
 </p>
 <span style='margin-left:20px'>
-<a href='{{ linkTo({'token_auth':token_auth, 'action':setIgnoreCookie}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
+<a href='{{ linkTo({'token_auth':token_auth, 'action':'setIgnoreCookie'}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
     {% else %}{{'UsersManager_ClickHereToSetTheCookieOnDomain'|translate(piwikHost) }}{% endif %}
     <br/>
 </a></span>
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index a5746c58479..0e721e8fd0f 100644
--- a/plugins/Zeitgeist/templates/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -49,7 +49,7 @@
 
                     {% if configFileNotWritable is not empty %}
                     <div class="ajaxSuccess" style="display:inline-block">
-                        {{ 'General_ConfigFileIsNotWritable'|translate("(config/config.ini.php)","<br/>") }}
+                        {{ 'General_ConfigFileIsNotWritable'|translate("(config/config.ini.php)","<br/>")|raw }}
                     </div>
                     {% elseif false %}
                     <div class="ajaxSuccess" style="display:inline-block">