From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/sites/database_edit.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 933f105..22b631a 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -146,7 +146,7 @@
$app->tpl->setVar("database_name", $app->tools_sites->removePrefix($this->dataRecord['database_name'], $this->dataRecord['database_name_prefix'], $dbname_prefix));
}
- if($this->dataRecord['database_name'] == "" && $_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ if($this->dataRecord['database_name'] == "") {
$app->tpl->setVar("database_name_prefix", $dbname_prefix);
} else {
$app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']));
--
Gitblit v1.9.1