Skip to content
Snippets Groups Projects
Commit c0ba4f65 authored by Tim Steiner's avatar Tim Steiner
Browse files

Pushing last rev up to testing.

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@233 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 11c85f04
No related branches found
No related tags found
No related merge requests found
......@@ -54,10 +54,7 @@ function unl_add_site($site_path, $uri, $clean_url, $db_prefix) {
$site_path = substr($site_path, 0, -1);
}
$path_parts = parse_url($uri);
$sites_subdir = $path_parts['host'] . $path_parts['path'];
$sites_subdir = strtr($sites_subdir, array('/' => '.'));
$sites_subdir = _unl_get_sites_subdir($uri);
$database = $GLOBALS['databases']['default']['default'];
$db_url = $database['driver']
......@@ -109,10 +106,7 @@ function unl_remove_site($site_path, $uri, $db_prefix) {
$db_prefix .= '_' . $database['prefix'];
$path_parts = parse_url($uri);
$sites_subdir = $path_parts['host'] . $path_parts['path'];
$sites_subdir = strtr($sites_subdir, array('/' => '.'));
$sites_subdir = _unl_get_sites_subdir($uri);
$sites_subdir = DRUPAL_ROOT . '/sites/' . $sites_subdir;
$sites_subdir = realpath($sites_subdir);
......@@ -147,6 +141,16 @@ function unl_remove_site($site_path, $uri, $db_prefix) {
return TRUE;
}
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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment