summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--handlers/views_handler_filter_in_operator.inc4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa584d3..1d6cdb6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -99,6 +99,7 @@ Views 2.3
o #366666 by Deadmonk also yched: File size field should not try to print a size on NULL values.
o #367203: Improper caching of default views caused incomplete handlers that could WSOD.
o #365283: views_handler_filter_ncs_last_updated improperly registered causing fatal errors trying to use it.
+ o #365712: select list exposed filters were trying to limit to list when selecting "All" even when "limit" was not selected.
Other changes:
o #288801 by drewish and eaton: Aggregator item support! Make views of feeds!
diff --git a/handlers/views_handler_filter_in_operator.inc b/handlers/views_handler_filter_in_operator.inc
index 1e18766..b2d3f60 100644
--- a/handlers/views_handler_filter_in_operator.inc
+++ b/handlers/views_handler_filter_in_operator.inc
@@ -145,8 +145,8 @@ class views_handler_filter_in_operator extends views_handler_filter {
}
// If this is single and optional, this says that yes this filter will
- // participate, but using the default settings.
- if (!empty($this->options['expose']['single']) && !empty($this->options['expose']['optional'])) {
+ // participate, but using the default settings, *if* 'limit is true.
+ if (!empty($this->options['expose']['single']) && !empty($this->options['expose']['optional']) && !empty($this->options['expose']['limit'])) {
$identifier = $this->options['expose']['identifier'];
if ($input[$identifier] == 'All') {
return TRUE;