Issue #2002498 by diarmy, phenaproxima: Rename Views method exposed_form_submit() to exposedFormSubmit().
parent
b53df3c9e8
commit
98c521d129
|
@ -271,12 +271,12 @@ abstract class ExposedFormPluginBase extends PluginBase {
|
||||||
* Nested array of keys to exclude of insert into
|
* Nested array of keys to exclude of insert into
|
||||||
* $view->exposed_raw_input
|
* $view->exposed_raw_input
|
||||||
*/
|
*/
|
||||||
function exposed_form_submit(&$form, &$form_state, &$exclude) {
|
public function exposedFormSubmit(&$form, &$form_state, &$exclude) {
|
||||||
if (!empty($form_state['values']['op']) && $form_state['values']['op'] == $this->options['reset_button_label']) {
|
if (!empty($form_state['values']['op']) && $form_state['values']['op'] == $this->options['reset_button_label']) {
|
||||||
$this->reset_form($form, $form_state);
|
$this->reset_form($form, $form_state);
|
||||||
}
|
}
|
||||||
if (isset($form_state['pager_plugin'])) {
|
if (isset($form_state['pager_plugin'])) {
|
||||||
$form_state['pager_plugin']->exposed_form_submit($form, $form_state, $exclude);
|
$form_state['pager_plugin']->exposedFormSubmit($form, $form_state, $exclude);
|
||||||
$exclude[] = 'pager_plugin';
|
$exclude[] = 'pager_plugin';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -243,7 +243,7 @@ abstract class PagerPluginBase extends PluginBase {
|
||||||
|
|
||||||
function exposed_form_validate(&$form, &$form_state) { }
|
function exposed_form_validate(&$form, &$form_state) { }
|
||||||
|
|
||||||
function exposed_form_submit(&$form, &$form_state, &$exclude) { }
|
public function exposedFormSubmit(&$form, &$form_state, &$exclude) { }
|
||||||
|
|
||||||
function uses_exposed() {
|
function uses_exposed() {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -1460,7 +1460,7 @@ function views_exposed_form_submit(&$form, &$form_state) {
|
||||||
|
|
||||||
$exclude = array('submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', '', 'reset');
|
$exclude = array('submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', '', 'reset');
|
||||||
$exposed_form_plugin = $form_state['exposed_form_plugin'];
|
$exposed_form_plugin = $form_state['exposed_form_plugin'];
|
||||||
$exposed_form_plugin->exposed_form_submit($form, $form_state, $exclude);
|
$exposed_form_plugin->exposedFormSubmit($form, $form_state, $exclude);
|
||||||
|
|
||||||
foreach ($form_state['values'] as $key => $value) {
|
foreach ($form_state['values'] as $key => $value) {
|
||||||
if (!in_array($key, $exclude)) {
|
if (!in_array($key, $exclude)) {
|
||||||
|
|
Loading…
Reference in New Issue