diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/digest.php | 2 | ||||
-rw-r--r-- | include/feedbrowser.php | 5 | ||||
-rw-r--r-- | include/functions.php | 15 | ||||
-rw-r--r-- | include/labels.php | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/include/digest.php b/include/digest.php index 4427936e5..71ee6d203 100644 --- a/include/digest.php +++ b/include/digest.php @@ -127,8 +127,6 @@ ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC LIMIT $limit"); - $cur_feed_title = ""; - $headlines_count = db_num_rows($result); $headlines = array(); diff --git a/include/feedbrowser.php b/include/feedbrowser.php index d35f1ebf8..8907aa9e4 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -63,7 +63,7 @@ htmlspecialchars($line["title"])."</span></a>"; $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\" - href=\"$feed_url\"><img src='images/pub_set.svg' + href=\"$feed_url\"><img src='images/pub_set.png' style='vertical-align : middle'></a>"; $rv .= "<li>$check_box $feed_url $site_url". @@ -72,7 +72,6 @@ } else if ($mode == 2) { $feed_url = htmlspecialchars($line["feed_url"]); $site_url = htmlspecialchars($line["site_url"]); - $title = htmlspecialchars($line["title"]); $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\" type=\"checkbox\">"; @@ -92,7 +91,7 @@ htmlspecialchars($line["title"])."</span></a>"; $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\" - href=\"$feed_url\"><img src='images/pub_set.svg' + href=\"$feed_url\"><img src='images/pub_set.png' style='vertical-align : middle'></a>"; diff --git a/include/functions.php b/include/functions.php index 8e8832a58..48f6218e1 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1613,7 +1613,6 @@ AND ttrss_counters_cache.feed_id = id"; $result = db_query($query); - $fctrs_modified = false; while ($line = db_fetch_assoc($result)) { @@ -2922,7 +2921,6 @@ $fragment = $doc->createDocumentFragment(); $text = $child->textContent; - $stubs = array(); while (($pos = mb_stripos($text, $word)) !== false) { $fragment->appendChild(new DomText(mb_substr($text, 0, $pos))); @@ -3104,19 +3102,16 @@ } function format_warning($msg, $id = "") { - global $link; return "<div class=\"warning\" id=\"$id\"> <span><img src=\"images/alert.png\"></span><span>$msg</span></div>"; } function format_notice($msg, $id = "") { - global $link; return "<div class=\"notice\" id=\"$id\"> <span><img src=\"images/information.png\"></span><span>$msg</span></div>"; } function format_error($msg, $id = "") { - global $link; return "<div class=\"error\" id=\"$id\"> <span><img src=\"images/alert.png\"></span><span>$msg</span></div>"; } @@ -3225,8 +3220,6 @@ $line = db_fetch_assoc($result); - $tag_cache = $line["tag_cache"]; - $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]); unset($line["tag_cache"]); @@ -3382,7 +3375,7 @@ $rv['content'] .= " "; $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>"; - $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.svg'></a>"; + $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>"; $rv['content'] .= "</div>"; } @@ -4268,9 +4261,9 @@ $fetch_last_error = curl_errno($curl) . " " . curl_error($curl); curl_close($curl); - $oline=''; - foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} - $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; +# $oline=''; +# foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} +# $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; # $handle = @fopen('./curl.error.log', 'a'); # fwrite($handle, $line); return FALSE; diff --git a/include/labels.php b/include/labels.php index 6e0bfcb98..4149864b3 100644 --- a/include/labels.php +++ b/include/labels.php @@ -109,7 +109,7 @@ if (!$label_id) return; - $result = db_query( + db_query( "DELETE FROM ttrss_user_labels2 WHERE label_id = '$label_id' AND |