From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.
---
interface/web/help/faq_delete.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/interface/web/help/faq_delete.php b/interface/web/help/faq_delete.php
index 1dfc69f..e8f3627 100644
--- a/interface/web/help/faq_delete.php
+++ b/interface/web/help/faq_delete.php
@@ -1,17 +1,17 @@
<?php
// From and List definition files
-$list_def_file = 'list/faq_list.php';
+$list_def_file = 'list/faq_manage_questions_list.php';
$tform_def_file = 'form/faq.tform.php';
// Include the base libraries
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
// Check module permissions
-if(!stristr($_SESSION['s']['user']['modules'],'help')) {
- header('Location: ../index.php');
- die;
+if(!stristr($_SESSION['s']['user']['modules'], 'help')) {
+ header('Location: ../index.php');
+ die;
}
// Load the form
--
Gitblit v1.9.1