Merge remote-tracking branch 'origin/removal'

2013-12-05 09:02:40 +01:00
parent 188baaf180 eca5265735
commit 85ee0751bd
106 changed files with 107 additions and 8795 deletions
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -179,11 +179,6 @@ if ($page == 'domains'
 			if (isset($_POST['send'])
 				&& $_POST['send'] == 'send'
 			) {
-				//check for APS packages used with this domain, #110
-				if (domainHasApsInstances($id)) {
-					standard_error('domains_cantdeletedomainwithapsinstances');
-				}
-
 				// check for deletion of main-domains which are logically subdomains, #329
 				$rsd_sql = '';
 				$remove_subbutmain_domains = isset($_POST['delete_userfiles']) ? 1 : 0;