diff options
| author | Heiko Adams <[email protected]> | 2016-08-19 17:25:05 +0200 |
|---|---|---|
| committer | Heiko Adams <[email protected]> | 2016-08-19 17:25:05 +0200 |
| commit | 2842cf6e4563d1665741dd4c151798e6e282c60b (patch) | |
| tree | 6aa8c94dd1d3ae81976dd154ee6ca46eb31908f1 /classes | |
| parent | 94e3a9ab44d82e0d7052d5e2e40496230b5f21a4 (diff) | |
| parent | c565a0cc21a6ee3e74ac9bc0cf4bfdde7cc84efd (diff) | |
Merge branch 'master' into german-translation
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/api.php | 4 | ||||
| -rw-r--r-- | classes/pref/users.php | 2 | ||||
| -rwxr-xr-x | classes/rpc.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/classes/api.php b/classes/api.php index 9be04cff9..35c5d5f38 100644 --- a/classes/api.php +++ b/classes/api.php @@ -330,7 +330,7 @@ class API extends Handler { if ($article_id) { - $query = "SELECT id,title,link,content,feed_id,comments,int_id, + $query = "SELECT id,guid,title,link,content,feed_id,comments,int_id, marked,unread,published,score,note,lang, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title, @@ -352,6 +352,7 @@ class API extends Handler { $article = array( "id" => $line["id"], + "guid" => $line["guid"], "title" => $line["title"], "link" => $line["link"], "labels" => get_article_labels($line['id']), @@ -753,6 +754,7 @@ class API extends Handler { $headline_row = array( "id" => (int)$line["id"], + "guid" => $line["guid"], "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), "published" => sql_bool_to_bool($line["published"]), diff --git a/classes/pref/users.php b/classes/pref/users.php index a10404d0a..164935b23 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -37,7 +37,7 @@ class Pref_Users extends Handler_Protected { $access_level = $this->dbh->fetch_result($result, 0, "access_level"); $email = $this->dbh->fetch_result($result, 0, "email"); - $sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : ""; + $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : ""; print "<div class=\"dlgSec\">".__("User")."</div>"; print "<div class=\"dlgSecCont\">"; diff --git a/classes/rpc.php b/classes/rpc.php index 617c7a22b..9eb8dbd70 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -438,7 +438,7 @@ class RPC extends Handler_Protected { if ($this->dbh->num_rows($result) == 0) { $result = $this->dbh->query("INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id,site_url) - VALUES ('$id','".$_SESSION["uid"]."', + VALUES ('".$_SESSION["uid"]."', '$feed_url', '$title', NULL, '$site_url')"); } } |