valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:fox/tt-rss

This commit is contained in:
Andrew Dolgov 2021-02-26 19:17:27 +03:00
parent 3fd7856543 c6fb62f384
commit ef8c3abd7e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/feeds.php
View File

@ -710,7 +710,7 @@ class Pref_Feeds extends Handler_Protected {
$mark_unread_on_update = checkbox_to_sql_bool( $mark_unread_on_update = checkbox_to_sql_bool(
clean($_POST["mark_unread_on_update"] ?? "")); clean($_POST["mark_unread_on_update"] ?? ""));
$feed_language = clean($_POST["feed_language"]); $feed_language = clean($_POST["feed_language"] ?? "");
if (!$batch) { if (!$batch) {

3
js/App.js
View File

@ -52,8 +52,9 @@ const App = {
return this.button_tag(value, "", {...{onclick: "App.dialogOf(this).hide()"}, ...attributes}); return this.button_tag(value, "", {...{onclick: "App.dialogOf(this).hide()"}, ...attributes});
}, },
checkbox_tag: function(name, checked = false, value = "", attributes = {}, id = "") { checkbox_tag: function(name, checked = false, value = "", attributes = {}, id = "") {
// checked !== '0' prevents mysql "boolean" false to be implicitly cast as true
return `<input dojoType="dijit.form.CheckBox" type="checkbox" name="${App.escapeHtml(name)}" return `<input dojoType="dijit.form.CheckBox" type="checkbox" name="${App.escapeHtml(name)}"
${checked ? "checked" : ""} ${checked !== '0' && checked ? "checked" : ""}
${value ? `value="${App.escapeHtml(value)}"` : ""} ${value ? `value="${App.escapeHtml(value)}"` : ""}
${this.attributes_to_string(attributes)} id="${App.escapeHtml(id)}">` ${this.attributes_to_string(attributes)} id="${App.escapeHtml(id)}">`
}, },