From cfc2fe50cb32b43f4c60c1445458eb2211c20583 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 5 Jul 2016 11:48:36 +0300
Subject: fix sql error when subscribing to a feed using feed archive

---
 classes/rpc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

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')");
 					}
 				}
-- 
cgit v1.2.3


From 18186149495108becf8e07344cbafef9110b5aa3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Jul 2016 15:38:42 +0300
Subject: api: fix article guid not being passed to render article hook

---
 classes/api.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes')

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"]),
-- 
cgit v1.2.3


From a84fb943b4c5a030e215fa819e579ca4646cf617 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Aug 2016 17:54:27 +0300
Subject: pre-users: disallow renaming admin user

---
 classes/pref/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

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\">";
-- 
cgit v1.2.3