Commit 439c00dd authored by merlinofchaos's avatar merlinofchaos
Browse files

Fix a bug with node title links; allow filters to hang around in RSS feed links.

parent ac416140
......@@ -345,7 +345,7 @@ function views_handler_field_nodelink_with_mark($fieldinfo, $fielddata, $value,
else {
$link = l($value, "node/$data->nid");
}
return l($link, "node/$data->nid") .' '. theme('mark', node_mark($data->nid, $data->node_changed));
return $link .' '. theme('mark', node_mark($data->nid, $data->node_changed));
}
/*
......
......@@ -81,12 +81,15 @@ function _views_view_build_filters(&$query, &$view) {
$field = $fieldbits[1];
}
$view->used_filters = array();
foreach($view->exposed_filter as $count => $expose) {
if ($filter['id'] == $expose['id']) {
$id = $expose['id'];
if (!$expose['operator'] && $_GET["op$count"]) {
$filter['operator'] = check_plain($_GET["op$count"]);
$view->used_filters["op$count"] = $_GET["op$count"];
}
if ($expose['optional']) {
......@@ -95,6 +98,7 @@ function _views_view_build_filters(&$query, &$view) {
}
if ($_GET["filter$count"] == '**ALL**' ||
(is_array($_GET["filter$count"]) && in_array('**ALL**', $_GET["filter$count"]))) {
$view->used_filters["filter$count"] = $_GET["filter$count"];
continue 2; // skip this filter entirely.
}
}
......@@ -104,6 +108,7 @@ function _views_view_build_filters(&$query, &$view) {
$value = array($value);
}
$filter['value'] = $value;
$view->used_filters["filter$count"] = $_GET["filter$count"];
}
break;
}
......
......@@ -84,12 +84,13 @@ function views_rss_views_feed_argument($op, &$view, $arg) {
$args = views_post_view_make_args($view, $arg, 'feed');
$url = views_get_url($view, $args);
$title = views_get_title($view, 'page', $args);
drupal_add_link(array('rel' => 'alternate',
'type' => 'application/rss+xml',
'title' => check_plain($title),
'href' => url($url, NULL, NULL, TRUE)));
'href' => url($url, drupal_query_string_encode($view->used_filters), NULL, TRUE)));
if ($view->build_type != 'block') {
return theme('feed_icon', url($url));
return theme('feed_icon', url($url, drupal_query_string_encode($view->used_filters)));
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment