maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2015-05-06 15:37:46 +02:00
parent 565866c529 e4a262eb7b
commit ec77e47cd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_domains.php
View File

@@ -397,7 +397,7 @@ if ($page == 'domains'
$documentroot = $_POST['documentroot'];
}
} elseif (isset($_POST['documentroot'])
&& ($_POST['documentroot'] == '')
&& ($_POST['documentroot'] == '')
&& (Settings::Get('system.documentroot_use_default_value') == 1)
) {
$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain);
@@ -832,7 +832,7 @@ if ($page == 'domains'
SELECT `customerid`, `loginname`, `name`, `firstname`, `company`
FROM `" . TABLE_PANEL_CUSTOMERS . "` " .
($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") .
" ORDER BY `name` ASC"
" ORDER BY COALESCE(NULLIF(`name`,''), `company`) ASC"
);
$params = array();
if ($userinfo['customers_see_all'] == '0') {