From 85c75c684a26934f530ab970abddfb75c7ed8566 Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Tue, 7 Apr 2015 15:55:34 +0200
Subject: [PATCH] Update namefixer, IRCScraper and automated config.

---
 lib/IRCScraper.php                     | 2 +-
 lib/copy_this/www/automated.config.php | 2 +-
 lib/namefixer.php                      | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/IRCScraper.php b/lib/IRCScraper.php
index 6cda5d4c1..abbe7dac1 100644
--- a/lib/IRCScraper.php
+++ b/lib/IRCScraper.php
@@ -163,7 +163,7 @@ class IRCScraper extends IRCClient
 		}
 
 		// Join channels.
-		$this->joinChannels(array('#nZEDbPRE' => null));
+		$this->joinChannels(array('#PreNNTmux' => null));
 
 		if (!$this->_silent) {
 			echo
diff --git a/lib/copy_this/www/automated.config.php b/lib/copy_this/www/automated.config.php
index 2e4987dc5..4b0c20fa6 100644
--- a/lib/copy_this/www/automated.config.php
+++ b/lib/copy_this/www/automated.config.php
@@ -1,7 +1,7 @@
 <?php
 // YOU SHOULD NOT EDIT ANYTHING IN THIS FILE, COPY settings.php.example TO settings.php AND EDIT THAT FILE!
 
-define('NN_MINIMUM_PHP_VERSION', '5.4.0');
+define('NN_MINIMUM_PHP_VERSION', '5.5.0');
 define('NN_MINIMUM_MYSQL_VERSION', '5.5');
 
 define('DS', DIRECTORY_SEPARATOR);
diff --git a/lib/namefixer.php b/lib/namefixer.php
index db10b7658..3b6c4a2d4 100644
--- a/lib/namefixer.php
+++ b/lib/namefixer.php
@@ -199,11 +199,10 @@ class NameFixer
 					SELECT rel.id AS releaseid
 					FROM releases rel
 					INNER JOIN releasenfo nfo ON (nfo.releaseid = rel.id)
-					WHERE (isrenamed = %d OR rel.categoryid IN (%d, %d))
+					WHERE (isrenamed = %d OR rel.categoryid = %d)
 					AND proc_nfo = %d',
 				self::IS_RENAMED_NONE,
 				Category::CAT_MISC_OTHER,
-				Category::CAT_MISC_HASHED,
 				self::PROC_NFO_NONE
 			);
 		}
@@ -281,11 +280,10 @@ class NameFixer
 						rf.releaseid AS fileid, rel.id AS releaseid
 					FROM releases rel
 					INNER JOIN releasefiles rf ON (rf.releaseid = rel.id)
-					WHERE (isrenamed = %d OR rel.categoryid IN (%d, %d))
+					WHERE (isrenamed = %d OR rel.categoryid= %d)
 					AND proc_files = %d',
 				self::IS_RENAMED_NONE,
 				Category::CAT_MISC_OTHER,
-				Category::CAT_MISC_HASHED,
 				self::PROC_FILES_NONE
 			);
 		}
@@ -339,11 +337,10 @@ class NameFixer
 			$query = sprintf('
 					SELECT rel.id AS releaseid, rel.guid, rel.groupid
 					FROM releases rel
-					WHERE (isrenamed = %d OR rel.categoryid IN (%d, %d))
+					WHERE (isrenamed = %d OR rel.categoryid = %d)
 					AND proc_par2 = %d',
 				self::IS_RENAMED_NONE,
 				Category::CAT_MISC_OTHER,
-				Category::CAT_MISC_HASHED,
 				self::PROC_PAR2_NONE
 			);
 		}