Peter M. Groen / knowledgetree

Commit 99e1d42f4c18c3f74cfa41e2d63f3b97befef525

Authored by kevin_fourie
1 parent a5ee0330

Merged in from DEV trunk... 

KTS-3347
"CLONE -Add a Document to a folder problem(SUP-820)"
Fixed. Changed htmlentities to htmlspecialchars to stop conversion of international characters.

Committed By: Jonathan Byrne
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8447 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
lib/documentmanagement/MDTree.inc
  View file @99e1d42
... ... @@ -289,7 +289,7 @@ class MDTree {
289 289 $extraclass = ' inactive';
290 290 }
291 291  
292   - $treeStr .= '<li class="treenode' . $extraclass . '"><a class="pathnode" onclick="toggleElementClass(\'active\', this.parentNode);toggleElementClass(\'inactive\', this.parentNode);">' . htmlentities($treeToRender->mapnodes[$subnode_val]->getName()) . '</a>';
  292 + $treeStr .= '<li class="treenode' . $extraclass . '"><a class="pathnode" onclick="toggleElementClass(\'active\', this.parentNode);toggleElementClass(\'inactive\', this.parentNode);">' . htmlspecialchars($treeToRender->mapnodes[$subnode_val]->getName()) . '</a>';
293 293 $treeStr .= $this->_evilTreeRecursion($subnode_val, $treeToRender, $inputname);
294 294 $treeStr .= '</li>';
295 295 }
... ... @@ -301,7 +301,7 @@ class MDTree {
301 301 if ($leaf === $this->activevalue) {
302 302 $is_selected=' checked="checked"';
303 303 }
304   - $sValue = htmlentities($treeToRender->lookups[$leaf]->getName());
  304 + $sValue = htmlspecialchars($treeToRender->lookups[$leaf]->getName());
305 305 $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$sValue.'" '.$is_selected.'>' . $sValue .'</input>';
306 306 $treeStr .= '</li>'; }
307 307 }
... ... @@ -349,7 +349,7 @@ class MDTree {
349 349 if ($leaf === $this->activevalue) {
350 350 $is_selected=' checked="checked"';
351 351 }
352   - $sValue = htmlentities($treeToRender->lookups[$leaf]->getName());
  352 + $sValue = htmlspecialchars($treeToRender->lookups[$leaf]->getName());
353 353 $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$sValue.'" '.$is_selected.'>' . $sValue .'</input>';
354 354 $treeStr .= '</li>';
355 355 }
... ...