diff options
author | fox <[email protected]> | 2021-02-26 19:03:15 +0300 |
---|---|---|
committer | fox <[email protected]> | 2021-02-26 19:03:15 +0300 |
commit | c6fb62f3847b46b628ce4132061f062e12b9cf3b (patch) | |
tree | f163e19110518affd4b84db8bcbf5dea94f7c810 | |
parent | bc4475b6698f5a74e475674aa7af43253c459892 (diff) | |
parent | 27b676b7b2f79856fe72cd614372c7a9a0e58939 (diff) |
Merge pull request 'fix-mysql-support' (#10) from klatch/tt-rss:fix-mysql-support into master
Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/10
-rwxr-xr-x | classes/pref/feeds.php | 2 | ||||
-rw-r--r-- | js/App.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 3b4afab26..c7d4f1925 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -710,7 +710,7 @@ class Pref_Feeds extends Handler_Protected { $mark_unread_on_update = checkbox_to_sql_bool( clean($_POST["mark_unread_on_update"] ?? "")); - $feed_language = clean($_POST["feed_language"]); + $feed_language = clean($_POST["feed_language"] ?? ""); if (!$batch) { @@ -52,8 +52,9 @@ const App = { return this.button_tag(value, "", {...{onclick: "App.dialogOf(this).hide()"}, ...attributes}); }, 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)}" - ${checked ? "checked" : ""} + ${checked !== '0' && checked ? "checked" : ""} ${value ? `value="${App.escapeHtml(value)}"` : ""} ${this.attributes_to_string(attributes)} id="${App.escapeHtml(id)}">` }, |