From 4ceda504bb95abd1683e3eafa4265544f90a4411 Mon Sep 17 00:00:00 2001
From: Shawn Kwang <kwangs@uwm.edu>
Date: Wed, 8 Mar 2017 10:54:43 -0600
Subject: [PATCH] Drupal: Added UTF-8 encoding for HTML being loaded by
 DOMDocument. Fixes garbage output text for links and moderator links.

https://dev.gridrepublic.org/browse/DBOINCP-359
---
 drupal/sites/default/boinc/themes/boinc/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drupal/sites/default/boinc/themes/boinc/template.php b/drupal/sites/default/boinc/themes/boinc/template.php
index 3b833f546c..672f17e89a 100644
--- a/drupal/sites/default/boinc/themes/boinc/template.php
+++ b/drupal/sites/default/boinc/themes/boinc/template.php
@@ -714,7 +714,7 @@ function _boinc_create_moderator_links(&$links, &$moderator_links) {
   // Create an array of HTML elements from the $links string, keys
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
-  $dom->loadHTML($links);
+  $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
   foreach($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
@@ -754,7 +754,7 @@ function _boinc_create_moderator_links(&$links, &$moderator_links) {
 function _boinc_firstlink(&$alink) {
   if (!empty($alink)) {
     $dom = new DomDocument;
-    $dom->loadHTML($alink);
+    $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
     if ($myli->length>0) {