remove utf8_decode

diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php
index dab93ca..9abb737 100644 (file)
--- a/planetlab/sites/site.php
+++ b/planetlab/sites/site.php
@@ -40,8 +40,8 @@ $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
 // 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']);
+// $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'];
 $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 8eeab4f..d8632c3 100644 (file)
--- a/planetlab/sites/sites.php
+++ b/planetlab/sites/sites.php
@@ -151,8 +151,8 @@ if ($sites) foreach ($sites as $site) {
   $peers->cell($table,$peer_id);
   // Thomas Dreibholz suggested that utf8_decode could be non-needed
   // and maybe even harmful on modern systems like f23
   $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,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()) {
   $table->cell (l_site_t($site_id,$login_base));
   $table->cell (htmlentities($site['abbreviated_name']));
   if (plc_is_admin()) {