Support OR conditions for content extract

modmore · Jul 21, 2016 · 01841b8 · 01841b8
1 parent 61a956e
commit 01841b8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Command/ExtractCommand.php b/src/Command/ExtractCommand.php
@@ -109,7 +109,15 @@ public function extractContent($folder, $options)
 
             // Prepare the criteria for this context
             $contextCriteria = ($criteria) ? $criteria : array();
-            $contextCriteria['context_key'] = $contextKey;
+            if (count(array_filter(array_keys($contextCriteria), 'is_string')) > 0) {
+                // associative array => and conditions
+                $contextCriteria['context_key'] = $contextKey;
+            } else {
+                // sequential array => or conidtions
+                foreach ($contextCriteria as $i => $orCondition) {
+                    $contextCriteria[$i]['context_key'] = $contextKey;
+                }
+            }
 
             // Grab the count
             $count = $this->modx->getCount('modResource', $contextCriteria);