Commit 726e0a06 authored by merlinofchaos's avatar merlinofchaos

#211944: Wildcard substitution for arguments ignored in RSS feeds.

parent 98ac2429
......@@ -460,7 +460,7 @@ function views_handler_field_body($fieldinfo, $fielddata, $value, $data) {
}
// Allow modules to change $node->body before viewing.
node_invoke_nodeapi($node, 'view', $teaser, TRUE);
// Set the proper node part, then unset unused $node part so that a bad
// theme can not open a security hole.
$content = drupal_render($node->content);
......@@ -831,7 +831,7 @@ function views_post_view_make_url($view, $feed_id, $arg) {
}
}
}
return views_get_url($view, $args);
}
......@@ -851,11 +851,11 @@ function views_post_view_make_args($view, $feed_id, $arg) {
$args[] = $arg;
}
else if ($argdata['argdefault'] != 1) {
$args[] = '*';
$args[] = $argdata['wildcard'];
}
}
}
return $args;
}
......
......@@ -157,7 +157,7 @@ function theme_views_rss_feed($view, $nodes, $type) {
$namespaces = array_merge($namespaces, $element['namespace']);
}
}
// Prepare the item description
switch ($item_length) {
case 'fulltext':
......@@ -194,5 +194,5 @@ function theme_views_rss_feed($view, $nodes, $type) {
drupal_set_header('Content-Type: text/xml; charset=utf-8');
print $output;
module_invoke_all('exit');
exit;
exit;
}
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