pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into tweak/replace_domains

Browse Source
This commit is contained in:
DL6ER
2020-11-09 22:28:13 +01:00
parent a3b24e08aa e8ad94bc5d
commit 0de0edcc9b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/utils.js
+4
View File
@@ -17,6 +17,8 @@ function escapeHtml(text) {
"'": "'"
};
if (text === null) return null;
return text.replace(/[&<>"']/g, function (m) {
return map[m];
});
@@ -31,6 +33,8 @@ function unescapeHtml(text) {
"&#039;": "'"
};
if (text === null) return null;
return text.replace(/&(?:amp|lt|gt|quot|#039);/g, function (m) {
return map[m];
});
settings.php
+1 -1
View File
@@ -14,7 +14,7 @@ $piholeFTLConf = piholeFTLConfig();
// Handling of PHP internal errors
$last_error = error_get_last();
if($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR)
if(isset($last_error) && ($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR))
{
$error .= "There was a problem applying your settings.<br>Debugging information:<br>PHP error (".htmlspecialchars($last_error["type"])."): ".htmlspecialchars($last_error["message"])." in ".htmlspecialchars($last_error["file"]).":".htmlspecialchars($last_error["line"]);
}