From f81bb4771e07012af8eebb4d18b53103b54ac593 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Tue, 12 Oct 2010 20:52:23 +0000
Subject: [PATCH] Update to site creation tool to hopefully make drupal sites
more portable between installations. Part 2.
git-svn-id: file:///tmp/wdn_thm_drupal/trunk@237 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/unl_site_creation.php | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/sites/all/modules/unl/unl_site_creation.php b/sites/all/modules/unl/unl_site_creation.php
index 3155a082..91986d22 100644
--- a/sites/all/modules/unl/unl_site_creation.php
+++ b/sites/all/modules/unl/unl_site_creation.php
@@ -180,8 +180,7 @@ function unl_site_remove($site_id) {
}
$uri = $uri[0];
- $path_parts = parse_url($uri);
- $sites_subdir = $path_parts['host'] . $path_parts['path'];
+ $sites_subdir = _unl_get_sites_subdir($uri);
$sites_subdir = strtr($sites_subdir, array('/' => '.'));
$sites_subdir = DRUPAL_ROOT . '/sites/' . $sites_subdir;
$sites_subdir = realpath($sites_subdir);
@@ -206,6 +205,16 @@ function unl_site_remove($site_id) {
drupal_set_message('The site has been scheduled for removal.');
}
+function _unl_get_sites_subdir($uri) {
+ $path_parts = parse_url($uri);
+ if (substr($path_parts['host'], -7) == 'unl.edu') {
+ $path_parts['host'] = 'unl.edu';
+ }
+ $sites_subdir = $path_parts['host'] . $path_parts['path'];
+ $sites_subdir = strtr($sites_subdir, array('/' => '.'));
+
+ return $sites_subdir;
+}
--
GitLab