mail plugin: destination dropdown css fix

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index 5228d875ce91a1dcd373f024999a3693a860cab0..d6a399ffcdd9a1fd4db9a5c7740abfe9ceb4d00d 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -426,8 +426,10 @@
                                // Try to check if SQL regexp implementation chokes on a valid regexp
 
 
-                               $result = db_query("SELECT true AS true_val FROM ttrss_entries,
-                                       ttrss_user_entries, ttrss_feeds
+                               $result = db_query("SELECT true AS true_val
+                                        FROM ttrss_entries
+                                        JOIN ttrss_user_entries ON ttrss_entries.id = ttrss_user_entries.ref_id
+                                        JOIN ttrss_feeds ON ttrss_feeds.id = ttrss_user_entries.feed_id
                                        WHERE $filter_query_part LIMIT 1", false);
 
                                if ($result) {
@@ -1745,7 +1747,7 @@
                return $rv;
        }
 
-       function save_email_address($email) {
+       /* function save_email_address($email) {
                // FIXME: implement persistent storage of emails
 
                if (!$_SESSION['stored_emails'])
@@ -1753,7 +1755,7 @@
 
                if (!in_array($email, $_SESSION['stored_emails']))
                        array_push($_SESSION['stored_emails'], $email);
-       }
+       } */
 
 
        function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {