Commit ea388166 authored by anarcat's avatar anarcat Committed by anarcat

get rid of site_document_root, it's publish_path everywhere else. Should fix issue #239949

parent 1b2b5f51
......@@ -253,7 +253,7 @@ function provision_get_site_data($url) {
$site_data['site_url'] = $url;
$site_data['site_action_type'] = $args['commands'][1];
$docroot = drush_get_option("r", $_SERVER['PWD']);
$site_data['site_document_root'] = ($docroot) ? $docroot . '/webroot' : $_SERVER['DOCUMENT_ROOT'];
$site_data['publish_path'] = ($docroot) ? $docroot : $_SERVER['DOCUMENT_ROOT'];
$site_data['site_profile'] = ($site_data['site_profile']) ? $site_data['site_profile'] : variable_get('provision_default_profile', 'default');
$site_data['site_ip'] = variable_get('provision_apache_server_ip', '127.0.0.1');
$site_data['site_port'] = variable_get('provision_apache_server_ip', 80);
......
......@@ -14,8 +14,8 @@
endif; ?>
# Error handler for Drupal > 4.6.7
<Directory "<?php print $site_document_root; ?>/sites/<?php print $site_url; ?>/files">
<Directory "<?php print $publish_path; ?>/sites/<?php print $site_url; ?>/files">
SetHandler This_is_a_Drupal_security_line_do_not_remove
</Directory>
</VirtualHost>
\ No newline at end of file
</VirtualHost>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment