summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Jacq2011-01-04 21:32:05 (GMT)
committermig52011-01-04 21:32:05 (GMT)
commitfdc49f8fae5721b416b772dc960e6820228141a9 (patch)
tree9da34c9c53f27e85560f92e0c32768ef2232eee7
parent5eaf1e3f04806f1ad1b6c7dabe56a8a84fcef631 (diff)
#1014638 - add compatability for Drush 4, where the 'options' context has been renamed to 'cli'
-rw-r--r--provision.context.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/provision.context.inc b/provision.context.inc
index cc14449..080a72f 100644
--- a/provision.context.inc
+++ b/provision.context.inc
@@ -77,7 +77,7 @@ function provision_context_factory($name) {
$type = 'server';
$record = provision_sitealias_get_record($name);
- $options = array_merge(drush_get_context('stdin'), drush_get_context('options'));
+ $options = array_merge(drush_get_context('stdin'), drush_get_context('options'), drush_get_context('cli'));
if (isset($record['context_type'])) {
$type = $record['context_type'];
@@ -133,7 +133,7 @@ class provisionContext {
*/
function __get($name) {
if ($name == 'options') {
- return array_merge(provision_sitealias_get_record($this->name), array_filter(drush_get_context('stdin')), array_filter(drush_get_context('options')));
+ return array_merge(provision_sitealias_get_record($this->name), array_filter(drush_get_context('stdin')), array_filter(drush_get_context('options')), array_filte
}
if (array_key_exists($name, $this->properties)) {
if (isset($this->oid_map[$name]) && !empty($this->properties[$name])) {