diff --git a/functions.php b/functions.php index d775abb14..6b722a7ae 100644 --- a/functions.php +++ b/functions.php @@ -380,7 +380,7 @@ $result = db_query($link, "SELECT reg_exp, ttrss_filter_types.name AS name, - ttrss_filter_actions.name AS action, + ttrss_filter_actions.name AS action FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE enabled = true AND owner_uid = $owner_uid AND diff --git a/login.php b/login.php index 2bf8c7e91..bf5c4ca93 100644 --- a/login.php +++ b/login.php @@ -134,7 +134,7 @@ window.onload = init;