From 627b359c78f1be056735da4d9a2ef0ecb39b9425 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 25 Mar 2013 05:49:32 -0400
Subject: [PATCH] - Fixed FS#2797 - subdomain vhost + forced SuExec not working.

---
 interface/web/sites/ftp_user_edit.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index 674178d..455d126 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -113,7 +113,7 @@
 		$global_config = $app->getconf->get_global_config('sites');
 		$ftpuser_prefix = $app->tools_sites->replacePrefix($global_config['ftpuser_prefix'], $this->dataRecord);
 
-        $this->dataRecord['username_prefix'] = ($ftpuser_prefix === '' ? '#' : $ftpuser_prefix);
+        $this->dataRecord['username_prefix'] = $ftpuser_prefix;
 		
 		if ($app->tform->errorMessage == '') {
 			$this->dataRecord['username'] = $ftpuser_prefix . $this->dataRecord['username'];
@@ -151,7 +151,7 @@
 		
         $old_record = $app->tform->getDataRecord($this->id);
         $ftpuser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $ftpuser_prefix);
-        $this->dataRecord['username_prefix'] = ($ftpuser_prefix === '' ? '#' : $ftpuser_prefix);
+        $this->dataRecord['username_prefix'] = $ftpuser_prefix;
         
 		/* restrict the names */
 		if ($app->tform->errorMessage == '') {

--
Gitblit v1.9.1