Merge branch 'MAINT_3_4_6' into QA_3_4

2011-10-04 06:20:28 -04:00
parent 7d586b458d 1af420e223
commit bc5aa87ae9
2 changed files with 3 additions and 2 deletions
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -422,7 +422,7 @@ class ConfigFile
        }
        $verbose = $this->get("Servers/$id/verbose");
        if (!empty($verbose)) {
-            return $verbose;
+            return htmlspecialchars($verbose);
        }
        $host = $this->get("Servers/$id/host");
        return empty($host) ? 'localhost' : $host;
@@ -508,4 +508,4 @@ class ConfigFile
        return $c;
    }
 }
-?>
+?>