From 49bb816a1cf883d8ee317d0f6a8c168ee26801d9 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sat, 20 May 2017 16:56:53 +0200
Subject: [PATCH] Fixes #301
---
data/web/inc/init_db.inc.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php
index fdf9d692..a429efa8 100644
--- a/data/web/inc/init_db.inc.php
+++ b/data/web/inc/init_db.inc.php
@@ -569,7 +569,6 @@ function init_db_schema() {
// Recreate SQL views
foreach ($views as $view => $create) {
$pdo->query("DROP VIEW IF EXISTS `" . $view . "`;");
- $pdo->query("DROP TABLE IF EXISTS `" . $view . "`;");
$pdo->query($create);
}
@@ -577,10 +576,10 @@ function init_db_schema() {
$stmt = $pdo->query("INSERT INTO `admin` (`username`, `password`, `superadmin`, `created`, `modified`, `active`)
SELECT 'admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1
WHERE NOT EXISTS (SELECT * FROM `admin`);");
- $stmt = $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN (SELECT `username` FROM `domain_admins`);");
$stmt = $pdo->query("INSERT INTO `domain_admins` (`username`, `domain`, `created`, `active`)
SELECT `username`, 'ALL', NOW(), 1 FROM `admin`
- WHERE superadmin='1' AND `username` NOT IN (SELECT `username` FROM `domain_admins`);");
+ WHERE superadmin='1' AND `username` NOT IN (SELECT `username` FROM `domain_admins`);");
+ $stmt = $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN (SELECT `username` FROM `domain_admins`);");
// Insert new DB schema version
$stmt = $pdo->query("REPLACE INTO `versions` (`application`, `version`) VALUES ('db_schema', '" . $db_version . "');");