Fixed height/width image attributes for enclosures.

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

diff --git a/include/functions2.php b/include/functions2.php
index 19012c8e27a7ee933105eb12bf12e27778f3957c..a135049a585a058b1214733897f2fdda960a4646 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -284,7 +284,7 @@
 
        function search_to_sql($search, $search_language) {
 
-               $keywords = str_getcsv($search, " ");
+               $keywords = str_getcsv(trim($search), " ");
                $query_keywords = array();
                $search_words = array();
                $search_query_leftover = array();
@@ -1618,7 +1618,7 @@
                        $tags_str = "";
 
                        for ($i = 0; $i < $maxtags; $i++) {
-                               $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";
+                               $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
                        }
 
                        $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
@@ -1890,6 +1890,7 @@
                                $rv = $retval;
                        }
                }
+               unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
 
                if ($rv === '' && !empty($result)) {
                        $entries_html = array();
@@ -1952,9 +1953,9 @@
                                                                        if (!$hide_images) {
                                                                                $encsize = '';
                                                                                if ($entry['height'] > 0)
-                                                                                       $encsize .= ' height="' . intval($entry['width']) . '"';
+                                                                                       $encsize .= ' height="' . intval($entry['height']) . '"';
                                                                                if ($entry['width'] > 0)
-                                                                                       $encsize .= ' width="' . intval($entry['height']) . '"';
+                                                                                       $encsize .= ' width="' . intval($entry['width']) . '"';
                                                                                $rv .= "<p><img
                                                                                alt=\"".htmlspecialchars($entry["filename"])."\"
                                                                                src=\"" .htmlspecialchars($entry["url"]) . "\"
@@ -2283,7 +2284,6 @@
                curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
                //curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
                curl_setopt($curl, CURLOPT_TIMEOUT, 60);
-               curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 
                if (defined('_CURL_HTTP_PROXY')) {
                        curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);