From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 5 Apr 2016 15:37:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plewww
X-Git-Tag: plewww-5.2-7~2
X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=commitdiff_plain;h=22a22de9e1c0f4b35c4de5bf0e7bd75b3a5a8614;hp=eb8b3511afab391a1237696a77f54fdbb2c3a203

Merge branch 'master' of ssh://git.onelab.eu/git/plewww

* 'master' of ssh://git.onelab.eu/git/plewww:
  Setting tag plewww-5.2-6 Offer the option to set a node in 'upgrade' mode - like reinstall but leaving slices intact
---

diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php
index eb2f291..dab93ca 100644
--- a/planetlab/sites/site.php
+++ b/planetlab/sites/site.php
@@ -38,7 +38,10 @@ if (empty($sites)) {
 
 $site=$sites[0];
 // var names to api return
+// Thomas Dreibholz suggested that utf8_decode could be non-needed
+// and maybe even harmful on modern systems like f23
 $sitename= htmlentities(utf8_decode($site['name']));
+// $sitename= htmlentities($site['name']);
 $abbreviated_name= htmlentities($site['abbreviated_name']);
 $site_url= $site['url'];
 $login_base= $site['login_base'];
diff --git a/planetlab/sites/sites.php b/planetlab/sites/sites.php
index d4ab6b9..8eeab4f 100644
--- a/planetlab/sites/sites.php
+++ b/planetlab/sites/sites.php
@@ -149,7 +149,10 @@ if ($sites) foreach ($sites as $site) {
     $table->cell(l_site_t($site_id,$site_id));
   }
   $peers->cell($table,$peer_id);
+  // Thomas Dreibholz suggested that utf8_decode could be non-needed
+  // and maybe even harmful on modern systems like f23
   $table->cell (l_site_t($site_id,htmlentities(utf8_decode($site['name']))));
+  // $table->cell (l_site_t($site_id,htmlentities($site['name'])));
   $table->cell (l_site_t($site_id,$login_base));
   $table->cell (htmlentities($site['abbreviated_name']));
   if (plc_is_admin()) {