summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2006-12-03 17:28:17 (GMT)
committer Earl Miles2006-12-03 17:28:17 (GMT)
commitb79bc12a503b892192b6da56e78d4fae173dbe8d (patch)
treeda5fb9fd5287858c7e9aee8f6cec3b9e277fb0cf
parent078adb4dff38d6113648b85841f3e310ff95b7b5 (diff)
Some commits that didnt go in because I wasnt paying attention.
-rw-r--r--CHANGELOG.txt2
-rw-r--r--views_query.inc4
-rw-r--r--views_rss.info2
-rw-r--r--views_theme_wizard.info2
-rw-r--r--views_ui.info2
-rw-r--r--views_ui.module3
6 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ded2209..dff40de 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -51,6 +51,8 @@ Views --dev
o Use drupal_add_feed() for RSS icons so they can be themed.
o 99323: fix link in argument handling help
o Temporary fix for cache not being loaded for menu item creation
+ o 100317: exported view gets improperly formed value fields on filters
+ o 98441: Fixed 'optional' setting on exposed filters.
New features:
o 99225: CSS generator for views theme wizard
diff --git a/views_query.inc b/views_query.inc
index 4a25573..617a76e 100644
--- a/views_query.inc
+++ b/views_query.inc
@@ -101,7 +101,7 @@ function _views_view_build_filters(&$query, &$view) {
}
if ($expose['optional']) {
- if (!isset($_GET["filter$count"]) && !$expose['is_default']) {
+ if ((!isset($_GET["filter$count"]) || $_GET["filter$count"] == '') && !$expose['is_default']) {
continue 2; // skip
}
if ($_GET["filter$count"] == '**ALL**' ||
@@ -110,7 +110,7 @@ function _views_view_build_filters(&$query, &$view) {
continue 2; // skip this filter entirely.
}
}
- if (isset($_GET["filter$count"])) {
+ if (isset($_GET["filter$count"]) && $_GET["filter$count"] != '') {
$value = $_GET["filter$count"];
if ($filterinfo['value-type'] == 'array' && !is_array($value)) {
$value = array($value);
diff --git a/views_rss.info b/views_rss.info
index c70babb..e891f24 100644
--- a/views_rss.info
+++ b/views_rss.info
@@ -1,6 +1,6 @@
; $Id$
name = Views RSS
description = RSS plugin for the views feed selector argument.
-version = 1.1
+version = $Name$
package = Views
dependencies = views
diff --git a/views_theme_wizard.info b/views_theme_wizard.info
index f756762..5f89686 100644
--- a/views_theme_wizard.info
+++ b/views_theme_wizard.info
@@ -1,6 +1,6 @@
; $Id$
name = Views Theme Wizard
description = The views theme wizard helps create stub theming for views.
-version = 1.1
+version = $Name$
package = Views
dependencies = views
diff --git a/views_ui.info b/views_ui.info
index cc42e07..faa3c2f 100644
--- a/views_ui.info
+++ b/views_ui.info
@@ -1,6 +1,6 @@
; $Id$
name = Views UI
description = The Views UI module allows you to create and edit views.
-version = 1.1
+version = $Name$
package = Views
dependencies = views
diff --git a/views_ui.module b/views_ui.module
index 8eb71e8..f15f405 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -1872,9 +1872,8 @@ function views_create_view_code($vid) {
$output .= " 'tablename' => " . var_export($fieldbits[0], true) . ",\n";
$output .= " 'field' => " . var_export($fieldbits[1], true) . ",\n";
$output .= " 'operator' => " . var_export($filter['operator'], true) . ",\n";
- $value = var_export($filter['value'], true);
$output .= " 'options' => " . var_export($filter['options'], true) . ",\n";
- $output .= " 'value' => " . var_export($value, true) . ",\n";
+ $output .= " 'value' => " . var_export($filter['value'], true) . ",\n";
$output .= " ),\n";
$requires[$fieldbits[0]] = 1;
}