From 820563e910f46b80d12445a349ba9a1761d6d458 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 4 Oct 2010 16:38:57 +0000
Subject: [PATCH] Fixed site creation for sites that are created only one level
deep ie: http://example.com/newsite/
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x@219 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/cron.php | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sites/all/modules/unl/cron.php b/sites/all/modules/unl/cron.php
index 6b6a6de8..d8d43c6b 100644
--- a/sites/all/modules/unl/cron.php
+++ b/sites/all/modules/unl/cron.php
@@ -87,10 +87,16 @@ function unl_add_site($site_path, $uri, $clean_url, $db_prefix) {
}
$symlink_target = implode('/', $symlink_target);
+ if (!$symlink_target) {
+ $symlink_target = '.';
+ }
+
$command = "$php_path sites/all/modules/drush/drush.php -y --uri=$uri site-install unl_profile --sites-subdir=$sites_subdir --db-url=$db_url --db-prefix=$db_prefix --clean-url=$clean_url";
- mkdir($subdir, 0755, TRUE);
- symlink($symlink_target, $subdir . '/' . $symlink_name);
+ if ($subdir) {
+ mkdir($subdir, 0755, TRUE);
+ }
+ symlink($symlink_target, DRUPAL_ROOT . '/' . $subdir . '/' . $symlink_name);
shell_exec($command);
}
@@ -136,7 +142,7 @@ function unl_remove_site($site_path, $uri, $db_prefix) {
$symlink_name = array_pop($subdir);
$subdir_levels = count($subdir);
$subdir = implode('/', $subdir);
- unlink($subdir . '/' . $symlink_name);
+ unlink(DRUPAL_ROOT . '/' . $subdir . '/' . $symlink_name);
return TRUE;
}
--
GitLab