Merge branch 'hotfix/0.6.7'

boboldehampsink · May 21, 2014 · 10b3829 · 10b3829
2 parents 819e256 + b26f381
commit 10b3829
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -36,6 +36,9 @@ Map fields (2)
 
 Changelog
 =================
+###0.6.7###
+ - Bugfix: Criteria matching now checks all statuses and has no limit
+
 ###0.6.6###
  - Added an "onBeforeImportDelete" event, so your plugin can intervene on deletion by this plugin
 

diff --git a/services/ImportService.php b/services/ImportService.php
@@ -60,9 +60,12 @@ public function row($row, $data, $settings) {
 
             // Match with current data
             $criteria = craft()->elements->getCriteria(ElementType::Entry);
+            $criteria->limit = null;
+            $criteria->status = isset($settings['map']['status']) ? $settings['map']['status'] : null;
             $criteria->sectionId = $settings['section'];
+
             foreach($settings['map'] as $key => $value) {
-                if(isset($settings['unique'][$key]) && $settings['unique'][$key] == 1) {
+                if(isset($criteria->$settings['map'][$key]) && isset($settings['unique'][$key]) && $settings['unique'][$key] == 1) {
                     $criteria->$settings['map'][$key] = $fields[$value];
                 }
             }