From a26061ad5c6b3fb34918964d1d334a43d70344cc Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Tue, 13 Nov 2012 08:00:17 +0000
Subject: [PATCH] Empty commit

---
 sections/ajax/torrentgroup.php       |  5 +++--
 sections/forums/search.php           |  3 ++-
 sections/tools/misc/update_geoip.php | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php
index 6cd11bbf..17aaea49 100644
--- a/sections/ajax/torrentgroup.php
+++ b/sections/ajax/torrentgroup.php
@@ -2,7 +2,7 @@
 
 
 require(SERVER_ROOT.'/sections/torrents/functions.php');
-
+include(SERVER_ROOT.'/sections/bookmarks/functions.php'); 
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
@@ -51,6 +51,7 @@
 	'categoryName' => $CategoryName,
 	'time' => $TorrentDetails['Time'],
 	'vanityHouse' => $TorrentDetails['VanityHouse'] == 1,
+    'isBookmarked' => has_bookmarked('torrent', $GroupID),
 	'musicInfo' => $JsonMusicInfo
 );
 
@@ -77,7 +78,7 @@
 		'snatched' => (int) $Torrent['Snatched'],
 		'freeTorrent' => $Torrent['FreeTorrent'] == 1,
 		'time' => $Torrent['Time'],
-		'description' => $Torrent['Description'],
+        'description' => $Torrent['Description'],
 		'fileList' => $Torrent['FileList'],
 		'filePath' => $Torrent['FilePath'],
 		'userId' => (int) $Torrent['UserID'],
diff --git a/sections/forums/search.php b/sections/forums/search.php
index 2f1a554c..2dcef219 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -24,11 +24,12 @@
 // What are we looking for? Let's make sure it isn't dangerous.
 if(isset($_GET['search'])) {
 	$Search = trim($_GET['search']);
-	
 } else {
 	$Search = '';
 }
 
+
+
 // Searching for posts by a specific user
 if(!empty($_GET['user'])) {
 	$User = $_GET['user'];
diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php
index c807516c..b4cbf2a2 100644
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@@ -7,12 +7,12 @@
 View::show_header();
 
 //requires wget, unzip commands to be installed
-shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'02.zip');
+shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'06.zip');
 //shell_exec('wget http://debug.what.cd/GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('unzip GeoLiteCity_'.date('Ym').'02.zip');
-shell_exec('rm GeoLiteCity_'.date('Ym').'02.zip');
+shell_exec('unzip GeoLiteCity_'.date('Ym').'06.zip');
+shell_exec('rm GeoLiteCity_'.date('Ym').'06.zip');
 
-if(($Locations = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Locations = file("GeoLiteCity_".date('Ym')."06/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	error("Download or extraction of maxmind database failed");
 }
 array_shift($Locations);
@@ -31,7 +31,7 @@
 echo "There are ".count($CountryIDs)." CountryIDs";
 echo "<br />";
 
-if(($Blocks = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Blocks = file("GeoLiteCity_".date('Ym')."06/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	echo "Error";
 }
 array_shift($Blocks);