Commit 3daeb1ac authored by Ra Mänd's avatar Ra Mänd
Browse files

Non-optimal if conditions. Conditions which execution costs less than the previous one.

parent ad188d71
...@@ -233,12 +233,11 @@ class FieldCollectionItemEntity extends Entity { ...@@ -233,12 +233,11 @@ class FieldCollectionItemEntity extends Entity {
} }
list($recieved_id) = entity_extract_ids($this->hostEntityType, $entity); list($recieved_id) = entity_extract_ids($this->hostEntityType, $entity);
if ($this->isInUse() && !empty($this->hostEntityId)) { if (!empty($this->hostEntityId) && $this->isInUse()) {
if (is_array($this->hostEntityId)) { if (is_array($this->hostEntityId)) {
$current_id = in_array( $current_id = in_array($recieved_id, $this->hostEntityId)
$recieved_id, ? $recieved_id
$this->hostEntityId : FALSE;
) ? $recieved_id : FALSE;
} }
else { else {
$current_id = $this->hostEntityId; $current_id = $this->hostEntityId;
...@@ -412,7 +411,7 @@ class FieldCollectionItemEntity extends Entity { ...@@ -412,7 +411,7 @@ class FieldCollectionItemEntity extends Entity {
* Determines the language code under which the item is stored. * Determines the language code under which the item is stored.
*/ */
public function langcode() { public function langcode() {
if ($this->delta() === NULL || empty($this->langcode)) { if (empty($this->langcode) || $this->delta() === NULL) {
$this->langcode = field_collection_entity_language('field_collection_item', $this); $this->langcode = field_collection_entity_language('field_collection_item', $this);
} }
...@@ -463,7 +462,7 @@ class FieldCollectionItemEntity extends Entity { ...@@ -463,7 +462,7 @@ class FieldCollectionItemEntity extends Entity {
} }
// Copy the values of translatable fields for a new field collection item. // Copy the values of translatable fields for a new field collection item.
if (field_collection_item_is_translatable() && !empty($this->is_new) && $this->langcode() == LANGUAGE_NONE) { if (!empty($this->is_new) && field_collection_item_is_translatable() && $this->langcode() == LANGUAGE_NONE) {
$this->copyTranslations(); $this->copyTranslations();
} }
......
...@@ -374,7 +374,7 @@ function field_collection_update_7008() { ...@@ -374,7 +374,7 @@ function field_collection_update_7008() {
->fieldLanguageCondition($f_name, LANGUAGE_NONE); ->fieldLanguageCondition($f_name, LANGUAGE_NONE);
$query_result = $query->execute(); $query_result = $query->execute();
if (isset($query_result['field_collection_item'])) { if (isset($query_result['field_collection_item'])) {
$results = $results + $query_result['field_collection_item']; $results += $query_result['field_collection_item'];
} }
} }
} }
......
...@@ -150,7 +150,7 @@ class MigrateDestinationFieldCollection extends MigrateDestinationEntity { ...@@ -150,7 +150,7 @@ class MigrateDestinationFieldCollection extends MigrateDestinationEntity {
$status = entity_save('field_collection_item', $entity); $status = entity_save('field_collection_item', $entity);
migrate_instrument_stop('field_collection_save'); migrate_instrument_stop('field_collection_save');
if (in_array($this->hostEntityType, array('node', 'field_collection_item')) || ($status !== FALSE)) { if ($status !== FALSE || in_array($this->hostEntityType, array('node', 'field_collection_item'))) {
$this->complete($entity, $row); $this->complete($entity, $row);
if ($updating) { if ($updating) {
$this->numUpdated++; $this->numUpdated++;
......
...@@ -294,7 +294,7 @@ function field_collection_menu() { ...@@ -294,7 +294,7 @@ function field_collection_menu() {
* Implements hook_menu_alter() to fix the field collections admin UI tabs. * Implements hook_menu_alter() to fix the field collections admin UI tabs.
*/ */
function field_collection_menu_alter(&$items) { function field_collection_menu_alter(&$items) {
if (module_exists('field_ui') && isset($items['admin/structure/field-collections/%field_collection_field_name/fields'])) { if (isset($items['admin/structure/field-collections/%field_collection_field_name/fields']) && module_exists('field_ui')) {
// Make the fields task the default local task. // Make the fields task the default local task.
$items['admin/structure/field-collections/%field_collection_field_name'] = $items['admin/structure/field-collections/%field_collection_field_name/fields']; $items['admin/structure/field-collections/%field_collection_field_name'] = $items['admin/structure/field-collections/%field_collection_field_name/fields'];
$item = &$items['admin/structure/field-collections/%field_collection_field_name']; $item = &$items['admin/structure/field-collections/%field_collection_field_name'];
...@@ -369,7 +369,7 @@ function field_collection_item_access($op, FieldCollectionItemEntity $item = NUL ...@@ -369,7 +369,7 @@ function field_collection_item_access($op, FieldCollectionItemEntity $item = NUL
// We do not support editing field collection revisions that are not used at // We do not support editing field collection revisions that are not used at
// the hosts default revision as saving the host might result in a new default // the hosts default revision as saving the host might result in a new default
// revision. // revision.
if (isset($item) && !$item->isInUse() && $op != 'view') { if ($op != 'view' && isset($item) && !$item->isInUse()) {
return FALSE; return FALSE;
} }
if (user_access('edit field collections', $account)) { if (user_access('edit field collections', $account)) {
...@@ -577,7 +577,7 @@ function field_collection_field_update($host_entity_type, $host_entity, $field, ...@@ -577,7 +577,7 @@ function field_collection_field_update($host_entity_type, $host_entity, $field,
// In case the entity has been changed / created, save it and set the id. // In case the entity has been changed / created, save it and set the id.
// If the host entity creates a new revision, save new item-revisions as // If the host entity creates a new revision, save new item-revisions as
// well. // well.
if (isset($item['entity']) || !empty($host_entity->revision)) { if (!empty($host_entity->revision) || isset($item['entity'])) {
if ($entity = field_collection_field_get_entity($item)) { if ($entity = field_collection_field_get_entity($item)) {
// If the host entity is saved as new revision, do the same for the item. // If the host entity is saved as new revision, do the same for the item.
if (!empty($host_entity->revision) || !empty($host_entity->is_new_revision)) { if (!empty($host_entity->revision) || !empty($host_entity->is_new_revision)) {
...@@ -1124,7 +1124,7 @@ function field_collection_field_formatter_links(&$element, $entity_type, $entity ...@@ -1124,7 +1124,7 @@ function field_collection_field_formatter_links(&$element, $entity_type, $entity
$path = field_collection_field_get_path($field); $path = field_collection_field_get_path($field);
list($id) = entity_extract_ids($entity_type, $entity); list($id) = entity_extract_ids($entity_type, $entity);
$element['#suffix'] = ''; $element['#suffix'] = '';
if (!empty($settings['description']) && $entity_type != 'node') { if ($entity_type != 'node' && !empty($settings['description'])) {
$element['#suffix'] .= '<div class="description field-collection-description">' . field_filter_xss($instance['description']) . '</div>'; $element['#suffix'] .= '<div class="description field-collection-description">' . field_filter_xss($instance['description']) . '</div>';
} }
$title = entity_i18n_string("field:{$field['field_name']}:{$instance['bundle']}:setting_add", $settings['add']); $title = entity_i18n_string("field:{$field['field_name']}:{$instance['bundle']}:setting_add", $settings['add']);
...@@ -1226,14 +1226,14 @@ function field_collection_field_widget_form(&$form, &$form_state, $field, $insta ...@@ -1226,14 +1226,14 @@ function field_collection_field_widget_form(&$form, &$form_state, $field, $insta
$field_state = field_form_get_state($field_parents, $field_name, $language, $form_state); $field_state = field_form_get_state($field_parents, $field_name, $language, $form_state);
if (field_collection_hide_blank_items($field) && $delta == $field_state['items_count'] && $delta > 0) { if ($delta > 0 && $delta == $field_state['items_count'] && field_collection_hide_blank_items($field)) {
// Do not add a blank item. Also see // Do not add a blank item. Also see
// field_collection_field_attach_form() for correcting #max_delta. // field_collection_field_attach_form() for correcting #max_delta.
$recursion--; $recursion--;
return FALSE; return FALSE;
} }
if (field_collection_hide_blank_items($field) && $field_state['items_count'] == 0) { if ($field_state['items_count'] == 0 && field_collection_hide_blank_items($field)) {
// We show one item, so also specify that as item count. So when the // We show one item, so also specify that as item count. So when the
// add button is pressed the item count will be 2 and we show two items. // add button is pressed the item count will be 2 and we show two items.
$field_state['items_count'] = 1; $field_state['items_count'] = 1;
...@@ -1445,11 +1445,11 @@ function field_collection_field_attach_form($entity_type, $entity, &$form, &$for ...@@ -1445,11 +1445,11 @@ function field_collection_field_attach_form($entity_type, $entity, &$form, &$for
} }
} }
if ($field['type'] == 'field_collection' if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED
&& $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED
&& empty($form_state['programmed']) && empty($form_state['programmed'])
&& $instance['widget']['type'] === 'field_collection_embed'
&& field_access('edit', $field, $entity_type) && field_access('edit', $field, $entity_type)
&& $instance['widget']['type'] == 'field_collection_embed') { && $field['type'] === 'field_collection') {
$element_langcode = $form[$field_name]['#language']; $element_langcode = $form[$field_name]['#language'];
$element_wrapper = $form[$field_name][$element_langcode]['add_more']['#ajax']['wrapper']; $element_wrapper = $form[$field_name][$element_langcode]['add_more']['#ajax']['wrapper'];
...@@ -1463,7 +1463,7 @@ function field_collection_field_attach_form($entity_type, $entity, &$form, &$for ...@@ -1463,7 +1463,7 @@ function field_collection_field_attach_form($entity_type, $entity, &$form, &$for
// If FCs are translatable, make sure we mark any necessary sub-fields in the // If FCs are translatable, make sure we mark any necessary sub-fields in the
// FC widget as translatable as well. // FC widget as translatable as well.
if ($entity_type == 'field_collection_item' if ($entity_type === 'field_collection_item'
&& field_collection_item_is_translatable() && field_collection_item_is_translatable()
) { ) {
foreach (field_info_instances($entity_type, $form['#bundle']) as $field_name => $instance) { foreach (field_info_instances($entity_type, $form['#bundle']) as $field_name => $instance) {
...@@ -1648,7 +1648,7 @@ function field_collection_field_get_entity(&$item, $field_name = NULL) { ...@@ -1648,7 +1648,7 @@ function field_collection_field_get_entity(&$item, $field_name = NULL) {
return $entity; return $entity;
} }
if (!isset($item['entity']) && isset($field_name)) { if (isset($field_name) && !isset($item['entity'])) {
$item['entity'] = entity_create('field_collection_item', array('field_name' => $field_name)); $item['entity'] = entity_create('field_collection_item', array('field_name' => $field_name));
return $item['entity']; return $item['entity'];
} }
...@@ -1731,7 +1731,7 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c ...@@ -1731,7 +1731,7 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c
} }
// Now validate required elements if the entity is not empty. // Now validate required elements if the entity is not empty.
if (!field_collection_item_is_empty($field_collection_item) && !empty($element['#field_collection_required_elements'])) { if (!empty($element['#field_collection_required_elements']) && !field_collection_item_is_empty($field_collection_item)) {
foreach ($element['#field_collection_required_elements'] as &$elements) { foreach ($element['#field_collection_required_elements'] as &$elements) {
// Copied from _form_validate(). // Copied from _form_validate().
...@@ -1754,7 +1754,7 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c ...@@ -1754,7 +1754,7 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c
$field_values = drupal_array_get_nested_value($form_state['values'], array_slice($elements['#array_parents'], 0, $field_depth)); $field_values = drupal_array_get_nested_value($form_state['values'], array_slice($elements['#array_parents'], 0, $field_depth));
// Special case lists since we don't get the correct array_parents. // Special case lists since we don't get the correct array_parents.
if (count($elements['#array_parents']) < $field_depth && is_array($field_values)) { if (is_array($field_values) && count($elements['#array_parents']) < $field_depth) {
$field_values = reset($field_values); $field_values = reset($field_values);
} }
...@@ -2020,7 +2020,7 @@ function field_collection_field_property_set($entity, $name, $value, $langcode, ...@@ -2020,7 +2020,7 @@ function field_collection_field_property_set($entity, $name, $value, $langcode,
$items[$delta][$columns[0]] = $value->item_id; $items[$delta][$columns[0]] = $value->item_id;
$items[$delta][$columns[1]] = $value->revision_id; $items[$delta][$columns[1]] = $value->revision_id;
} }
elseif (isset($value['value'], $value['revision_id']) && is_array($value)) { elseif (is_array($value) && isset($value['value'], $value['revision_id'])) {
$items[$delta][$columns[0]] = $value['value']; $items[$delta][$columns[0]] = $value['value'];
$items[$delta][$columns[1]] = $value['revision_id']; $items[$delta][$columns[1]] = $value['revision_id'];
} }
......
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