diff --git a/css/views.css b/css/views.css index beb5782..e4d6c4b 100644 --- a/css/views.css +++ b/css/views.css @@ -3,10 +3,6 @@ padding: .5em 1em 0 0; /* LTR */ } -.views-exposed-form .views-exposed-widget .form-submit { - margin-top: 1.6em; -} - .views-exposed-form .form-item, .views-exposed-form .form-submit { margin-top: 0; diff --git a/handlers/views_handler_filter.inc b/handlers/views_handler_filter.inc index 49b93e5..2718042 100644 --- a/handlers/views_handler_filter.inc +++ b/handlers/views_handler_filter.inc @@ -101,7 +101,7 @@ class views_handler_filter extends views_handler { /** * Simple validate handler */ - function options_validate(&$form, &$form_state) { + function options_validate($form, &$form_state) { $this->operator_validate($form, $form_state); $this->value_validate($form, $form_state); if (!empty($this->options['exposed'])) { @@ -113,7 +113,7 @@ class views_handler_filter extends views_handler { /** * Simple submit handler */ - function options_submit(&$form, &$form_state) { + function options_submit($form, &$form_state) { unset($form_state['values']['expose_button']); // don't store this. $this->operator_submit($form, $form_state); $this->value_submit($form, $form_state); diff --git a/handlers/views_handler_filter_boolean_operator.inc b/handlers/views_handler_filter_boolean_operator.inc index c2ec624..ec9e415 100644 --- a/handlers/views_handler_filter_boolean_operator.inc +++ b/handlers/views_handler_filter_boolean_operator.inc @@ -108,7 +108,7 @@ class views_handler_filter_boolean_operator extends views_handler_filter { } } - function value_validate(&$form, &$form_state) { + function value_validate($form, &$form_state) { if ($form_state['values']['options']['value'] == 'All' && empty($form_state['values']['options']['expose']['optional'])) { form_set_error('value', t('You must select a value unless this is an optional exposed filter.')); } diff --git a/handlers/views_handler_filter_numeric.inc b/handlers/views_handler_filter_numeric.inc index 4ea8644..7b394d2 100644 --- a/handlers/views_handler_filter_numeric.inc +++ b/handlers/views_handler_filter_numeric.inc @@ -189,10 +189,10 @@ class views_handler_filter_numeric extends views_handler_filter { $form['value']['min'] += $dependency; $form['value']['max'] += $dependency; } - if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['min'])) { + if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['min']) && isset($this->value['min']) && is_array($this->value['min'])) { $form_state['input'][$identifier]['min'] = $this->value['min']; } - if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['max'])) { + if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['max']) && isset($this->value['max']) && is_array($this->value['max'])) { $form_state['input'][$identifier]['max'] = $this->value['max']; } diff --git a/includes/view.inc b/includes/view.inc index c58b43f..deff20c 100644 --- a/includes/view.inc +++ b/includes/view.inc @@ -91,7 +91,7 @@ class view extends views_db_object { * Note: In PHP5 this should be static, but PHP4 doesn't support static * methods. */ - function db_objects() { + public static function db_objects() { return array('display'); } @@ -1339,7 +1339,7 @@ class view extends views_db_object { * If TRUE, reset this entry in the load cache. * @return A view object or NULL if it was not available. */ - function &load($arg, $reset = FALSE) { + public static function &load($arg, $reset = FALSE) { static $cache = array(); // We want a NULL value to return TRUE here, so we can't use isset() or empty(). @@ -1392,7 +1392,7 @@ class view extends views_db_object { * that would be very slow. Buiding the views externally from unified queries is * much faster. */ - function load_views() { + public static function load_views() { $result = db_query("SELECT DISTINCT v.* FROM {views_view} v"); $views = array(); $vids = array(); diff --git a/modules/taxonomy/views_handler_filter_term_node_tid.inc b/modules/taxonomy/views_handler_filter_term_node_tid.inc index ebcf10c..ceb8ea5 100644 --- a/modules/taxonomy/views_handler_filter_term_node_tid.inc +++ b/modules/taxonomy/views_handler_filter_term_node_tid.inc @@ -173,7 +173,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on } } - function value_validate(&$form, &$form_state) { + function value_validate($form, &$form_state) { // We only validate if they've chosen the text field style. if ($this->options['type'] != 'textfield') { return; diff --git a/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc b/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc index 5593fe6..c5caa1c 100644 --- a/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc +++ b/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc @@ -6,7 +6,7 @@ * because it uses a subquery to find nodes with */ class views_handler_filter_term_node_tid_depth extends views_handler_filter_term_node_tid { - function operator_options() { + function operator_options($which = 'title') { return array( 'or' => t('Is one of'), ); diff --git a/plugins/views_plugin_row.inc b/plugins/views_plugin_row.inc index 06d0930..2fe3ae4 100644 --- a/plugins/views_plugin_row.inc +++ b/plugins/views_plugin_row.inc @@ -98,13 +98,13 @@ class views_plugin_row extends views_plugin { /** * Validate the options form. */ - function options_validate($form, &$form_state) { } + function options_validate(&$form, &$form_state) { } /** * Perform any necessary changes to the form values prior to storage. * There is no need for this function to actually store the data. */ - function options_submit($form, &$form_state) { } + function options_submit(&$form, &$form_state) { } function query() { if (isset($this->base_table) && isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) { diff --git a/plugins/views_plugin_row_fields.inc b/plugins/views_plugin_row_fields.inc index 491f5d2..e741ab6 100644 --- a/plugins/views_plugin_row_fields.inc +++ b/plugins/views_plugin_row_fields.inc @@ -60,8 +60,7 @@ class views_plugin_row_fields extends views_plugin_row { * Perform any necessary changes to the form values prior to storage. * There is no need for this function to actually store the data. */ - function options_submit($form, &$form_state) { + function options_submit(&$form, &$form_state) { $form_state['values']['row_options']['inline'] = array_filter($form_state['values']['row_options']['inline']); } } -