Project

General

Profile

Revision c06bd9a4

Added by Assos Assos almost 4 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/panels/plugins/display_renderers/panels_renderer_editor.class.php
615 615
    }
616 616
    elseif (isset($content_type['category'])) {
617 617
      if (is_array($content_type['category'])) {
618
        list($category, $weight) = $content_type['category'];
618
        $category = reset($content_type['category']);
619 619
      }
620 620
      else {
621 621
        $category = $content_type['category'];
......
1052 1052
        case 'pane':
1053 1053
          $pane->style['style'] = $form_state['style'];
1054 1054
          if (isset($pane->style['settings'])) {
1055
            unset($pane->style['settings']);
1055
            $pane->style['settings'] = NULL;
1056 1056
          }
1057

  
1058 1057
          break;
1059 1058
      }
1060 1059
      panels_edit_cache_set($this->cache);
......
1149 1148

  
1150 1149
    // Backward compatibility: Translate old-style stylizer to new style
1151 1150
    // stylizer.
1152
    if ($style['name'] == 'stylizer' && !empty($conf['style']) && $conf['style'] != '$') {
1151
    if (isset($style['name']) && $style['name'] == 'stylizer' && !empty($conf['style']) && $conf['style'] != '$') {
1153 1152
      $style = panels_get_style('stylizer:' . $conf['style']);
1154 1153
    }
1155 1154

  
......
1404 1403
    );
1405 1404

  
1406 1405
    $output = ctools_modal_form_wrapper('panels_edit_configure_access_test_form', $form_state);
1406
    $pane->access['plugins'][$id] = $form_state['test'];
1407

  
1407 1408
    if (empty($form_state['executed'])) {
1408 1409
      $this->commands = $output;
1409 1410
      return;
......
2063 2064
    $function($form, $form_state);
2064 2065
  }
2065 2066

  
2067
  if (!isset($form_state['values']['settings'])) {
2068
    $form_state['values']['settings'] = array();
2069
  }
2066 2070
  $form_state['test']['settings'] = $form_state['values']['settings'];
2067 2071
  if (isset($form_state['values']['context'])) {
2068 2072
    $form_state['test']['context'] = $form_state['values']['context'];

Also available in: Unified diff