From 355efb9a7f74a2035f595bbd0d03375710d08587 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 25 Jan 2012 09:43:56 -0500
Subject: [PATCH] Merged revisions 2886-2909 from stable branch.

---
 server/cron_daily.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/cron_daily.php b/server/cron_daily.php
index 3f86a26..67d9945 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -180,7 +180,7 @@
 	
 	if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
 	
-	$sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') server_id = ".$conf['server_id'];
+	$sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') AND server_id = ".$conf['server_id'];
 	$aliases = $app->db->queryAllRecords($sql);
 	$aliasdomain = '';
 	

--
Gitblit v1.9.1