Index: branches/website/updates/index.php
===================================================================
--- branches/website/updates/index.php	(revision 643)
+++ branches/website/updates/index.php	(revision 645)
@@ -12,5 +12,5 @@
 
 //Output the list of mirrors
-$query = mysql_query('SELECT * FROM mirrors ORDER By Continent, Country, City');
+$query = mysql_query('SELECT * FROM updater_mirrors ORDER By Continent, Country, City');
 echo '	<mirrors>
 	<mirror location="(automatically decide)">http://downloads.sourceforge.net/eraser/</mirror>' . "\n";
@@ -23,9 +23,13 @@
 
 //Prepare the list of updates
-$query = mysql_query(sprintf('SELECT * FROM downloads WHERE
-	(MinVersion IS NULL AND MaxVersion IS NULL) OR
-	(MinVersion IS NULL AND MaxVersion > \'%1$s\') OR
-	(MinVersion <= \'%1$s\' AND MaxVersion IS NULL) OR
-	(MinVersion <= \'%1$s\' AND MaxVersion > \'%1$s\')
+$query = mysql_query(sprintf('SELECT updater_downloads.*, updater_publishers.Name as PublisherName
+	FROM updater_downloads
+	INNER JOIN updater_publishers ON
+		updater_downloads.PublisherID=updater_publishers.PublisherID
+	WHERE
+		(MinVersion IS NULL AND MaxVersion IS NULL) OR
+		(MinVersion IS NULL AND MaxVersion > \'%1$s\') OR
+		(MinVersion <= \'%1$s\' AND MaxVersion IS NULL) OR
+		(MinVersion <= \'%1$s\' AND MaxVersion > \'%1$s\')
 	ORDER BY `Type` ASC', $version));