mail plugin: destination dropdown css fix

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

diff --git a/include/functions2.php b/include/functions2.php
index 22c602362ccae81762293100719547c7ad5f1e6a..d6a399ffcdd9a1fd4db9a5c7740abfe9ceb4d00d 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -399,6 +399,7 @@
                        if ($search) {
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH) as $plugin) {
                                        list($search_query_part, $search_words) = $plugin->hook_search($search);
+                                       break;
                                }
 
                                // fall back in case of no plugins
@@ -425,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) {
@@ -1744,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'])
@@ -1752,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) {
@@ -1845,8 +1848,17 @@
                $result = get_article_enclosures($id);
                $rv = '';
 
-               if (count($result) > 0) {
+               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
+                       $retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
+                       if (is_array($retval)) {
+                               $rv = $retval[0];
+                               $result = $retval[1];
+                       } else {
+                               $rv = $retval;
+                       }
+               }
 
+               if ($rv === '' && !empty($result)) {
                        $entries_html = array();
                        $entries = array();
                        $entries_inline = array();