Commit 4f11e692 authored by ergonlogic's avatar ergonlogic

Issue #2191327: Replace hook_drush_load() with --exclude.

parent 14760417
<?php
/**
* Implements hook_drush_load().
* Implements hook_drush_load(). Deprecated. Removed in Drush 7.x.
*
* Checks if the corresponsing Hosting Feature is installed and enabled.
*/
......
<?php
/**
* Implements hook_drush_load().
* Implements hook_drush_load(). Deprecated. Removed in Drush 7.x.
*
* Checks if the corresponsing Hosting Feature is enabled.
*/
......
......@@ -86,7 +86,7 @@ if ($this->redirection || $ssl_redirection) {
<?php
$if_subsite = $this->data['http_subdird_path'] . '/' . $this->uri;
if (subdirs_drush_load() && provision_file()->exists($if_subsite)->status()) {
if (hosting_feature_enabled('subdirs') && provision_file()->exists($if_subsite)->status()) {
print " Include " . $if_subsite . "/*.conf\n";
}
?>
......
......@@ -68,7 +68,7 @@ else {
print " include " . $server->include_path . "/nginx_vhost_common.conf;\n";
}
$if_subsite = $this->data['http_subdird_path'] . '/' . $this->uri;
if (subdirs_drush_load() && provision_file()->exists($if_subsite)->status()) {
if (hosting_feature_enabled('subdirs') && provision_file()->exists($if_subsite)->status()) {
print " include " . $if_subsite . "/*.conf;\n";
}
?>
......
......@@ -17,7 +17,7 @@ class Provision_Service_http_apache extends Provision_Service_http_public {
$this->configs['server'][] = 'Provision_Config_Apache_Server';
$this->configs['platform'][] = 'Provision_Config_Apache_Platform';
$this->configs['site'][] = 'Provision_Config_Apache_Site';
if (subdirs_drush_load()) {
if (hosting_feature_enabled('subdirs')) {
$this->configs['site'][] = 'Provision_Config_Apache_Subdir';
$this->configs['site'][] = 'Provision_Config_Apache_SubdirVhost';
}
......
......@@ -22,7 +22,7 @@ class Provision_Service_http_nginx extends Provision_Service_http_public {
$this->server->setProperty('nginx_has_gzip', FALSE);
$this->server->setProperty('provision_db_cloaking', TRUE);
$this->server->setProperty('phpfpm_mode', 'port');
if (subdirs_drush_load()) {
if (hosting_feature_enabled('subdirs')) {
$this->configs['site'][] = 'Provision_Config_Nginx_Subdir';
$this->configs['site'][] = 'Provision_Config_Nginx_SubdirVhost';
}
......
......@@ -9,7 +9,7 @@
/**
* Implements hook_drush_load().
* Implements hook_drush_load(). Deprecated. Removed in Drush 7.x.
*
* In a drush contrib check if the frontend part (hosting_hook variant) is enabled.
*/
......
<?php
/**
* Implements hook_drush_load().
* Implements hook_drush_load(). Deprecated. Removed in Drush 7.x.
*
* Checks if the corresponsing Hosting Feature is installed and enabled.
*/
......
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