Merge pull request #413 from cmehay/master

[tt-rss.git] / classes / article.php

diff --git a/classes/article.php b/classes/article.php
index e9f86f2984d6a709fe5cf8aeb0c4caebd0018eec..9aef107ec1e9a0d5a96b4a2985bdc06b4ff7eb23 100644 (file)
--- a/classes/article.php
+++ b/classes/article.php
@@ -30,7 +30,6 @@ class Article extends Handler_Protected {
                $id = $this->dbh->escape_string($_REQUEST["id"]);
                $cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"]));
                $mode = $this->dbh->escape_string($_REQUEST["mode"]);
-               $omode = $this->dbh->escape_string($_REQUEST["omode"]);
 
                // in prefetch mode we only output requested cids, main article
                // just gets marked as read (it already exists in client cache)
@@ -44,7 +43,7 @@ class Article extends Handler_Protected {
                } else if ($mode == "raw") {
                        if ($_REQUEST['html']) {
                                header("Content-Type: text/html");
-                               print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
+                               print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
                        }
 
                        $article = format_article($id, false);
@@ -108,7 +107,7 @@ class Article extends Handler_Protected {
 
                // only check for our user data here, others might have shared this with different content etc
                $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
-                       link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
+                       guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
                if (db_num_rows($result) != 0) {
                        $ref_id = db_fetch_result($result, 0, "id");