From 3d8da75727166f8fe49b2fd38e55d87f2c72e65f Mon Sep 17 00:00:00 2001
From: DariusIII <thunderstorm1977>
Date: Wed, 1 Jun 2016 23:46:41 +0200
Subject: [PATCH] Fix more porting errors

---
 build/nntmux.xml     | 2 +-
 newznab/http/RSS.php | 6 +++---
 www/pages/rss.php    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/nntmux.xml b/build/nntmux.xml
index 055dce669..c0c8d425e 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -8,7 +8,7 @@
 				<precommit>9</precommit>
 				<!-- this is the version of the pre-commit file in githooks NOT the files it calls -->
 			</hooks>
-		<commit>5251</commit></git>
+		<commit>5252</commit></git>
 		<scripts>
 			<last>
 				<date>0000-00-00</date>
diff --git a/newznab/http/RSS.php b/newznab/http/RSS.php
index b0b8ceb17..17c3ddda5 100755
--- a/newznab/http/RSS.php
+++ b/newznab/http/RSS.php
@@ -63,7 +63,7 @@ Class RSS extends Capabilities
 		if (count($cat)) {
 			if ($cat[0] == -2) {
 				$cartSearch = sprintf(
-					'INNER JOIN users_releases ON users_releases.user_id = %d AND users_releases.releases_id = r.id',
+					'INNER JOIN users_releases ON users_releases.userid = %d AND users_releases.releases_id = r.id',
 					$userID
 				);
 			} else if ($cat[0] != -1) {
@@ -150,7 +150,7 @@ Class RSS extends Capabilities
 						sprintf('
 							SELECT videos_id, categoryid
 							FROM user_series
-							WHERE user_id = %d',
+							WHERE userid = %d',
 							$userID
 						),
 						true
@@ -201,7 +201,7 @@ Class RSS extends Capabilities
 						sprintf('
 							SELECT imdbid, categories_id
 							FROM user_movies
-							WHERE user_id = %d',
+							WHERE userid = %d',
 							$userID
 						),
 						true
diff --git a/www/pages/rss.php b/www/pages/rss.php
index 75719d4c7..3b3d51541 100755
--- a/www/pages/rss.php
+++ b/www/pages/rss.php
@@ -22,7 +22,7 @@ if (!isset($_GET["t"]) && !isset($_GET["show"]) && !isset($_GET["anidb"])) {
 	$page->title = "Rss Info";
 	$page->meta_title = "Rss Nzb Info";
 	$page->meta_keywords = "view,nzb,description,details,rss,atom";
-	$page->meta_description = "View information about nZEDb RSS Feeds.";
+	$page->meta_description = "View information about Newznab Tmux RSS Feeds.";
 
 	$firstShow = $rss->getFirstInstance('videos_id', 'releases', 'id');
 	$firstAni = $rss->getFirstInstance('anidbid', 'releases', 'id');