Merge branch 'hotfix/culturefeed-kickstart/issues/1'

svenhoutmeyers · svenhoutmeyers · commit 7938d50803d8 · 2015-01-22T12:11:11.000+01:00
diff --git a/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php b/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php
@@ -88,7 +88,7 @@ private function importTerms($TermsElement, $pids = array()) {
       $termAttributes = $term->attributes();
 
       // Do not import disabled terms
-      if ($termAttributes['enabled'] == 'false') {
+      if ($termAttributes['enabled'] == 'false' && drupal_is_cli()) {
         drush_log('skipped disabled term: ' . $termAttributes['id'], 'warning');
         continue;
       }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ private function importTerms($TermsElement, $pids = array()) {`
`88`	`88`	`$termAttributes = $term->attributes();`
`89`	`89`
`90`	`90`	`// Do not import disabled terms`
`91`		`- if ($termAttributes['enabled'] == 'false') {`
	`91`	`+ if ($termAttributes['enabled'] == 'false' && drupal_is_cli()) {`
`92`	`92`	`drush_log('skipped disabled term: ' . $termAttributes['id'], 'warning');`
`93`	`93`	`continue;`
`94`	`94`	`}`