Fixed merge conflict

CHANGELOG.txt

@@ -23,6 +23,7 @@ Issue #1042502 by joelstein: Adds highlight class for selected checkboxes
 Issue #782480 by mikeker: Fixes concat problem with select-all-none class in Views 2.x
 Issue #967510 by tokimeki, mikeker: Fixes issues with radio buttons in block displays and nested displays
 Issue #1162488 by klickreflex: Fixes incorrect HTML in nested displays
+Issue #1164764 by mikeker: Apply button hidden when using default select list.  See issue #1149254.
 Issue #1072658 by tkoterwas: Fieldset #title not set in exposed filter block/panel
 
 Better Exposed Filters 6.x-1.0  2010-05-25

better_exposed_filters.module

@@ -241,8 +241,12 @@ function better_exposed_filters_form_alter(&$form, $form_state, $form_id) {
                 $form[$field_id]['#theme'] = 'select_as_hidden';
               }
               break;
+              
+            case 'default':
+              $show_apply = TRUE;
+              break;
 
-          } // switch
+          } // switch ($filter->options['expose']['bef_format']) {
         }   // if (isset($filter->options['expose']['bef_format'])) {
         else {
           // This is an exposed filter that is not controled by BEF.

better_exposed_filters_exposed_form_plugin.inc

@@ -351,7 +351,7 @@ class better_exposed_filters_exposed_form_plugin extends views_plugin_exposed_fo
             $form[$field_id]['#options'] = array();
             foreach ($opts as $index => $opt) {
               if (is_object($opt)) {
-                foreach ($option->option as $key => $val) {
+                foreach ($opt->option as $key => $val) {
                   $form[$field_id]['#options'][$key] = $val;
                 }
               }
@@ -432,6 +432,10 @@ class better_exposed_filters_exposed_form_plugin extends views_plugin_exposed_fo
             $form[$field_id]['#theme'] = 'select_as_hidden';
           }
           break;
+          
+        case 'default':
+          $show_apply = TRUE;
+          break;
 
       }     // switch ($options['bef_format'])
     }       // foreach ($this->options['bef']...)