Commit 7905a625 authored by merlinofchaos's avatar merlinofchaos

#127099 (Crell) Fix to views argument handling in RSS that made the RSS feeds...

#127099 (Crell) Fix to views argument handling in RSS that made the RSS feeds fail in panels and viewfield.
parent 83ebd552
......@@ -30,6 +30,7 @@ Views 4.7.x-dev
o #126428: (by scott.mclewin) Force single didn't work in all cases.
o #134703: Fixed problem with validation causing valid values to appear invalid (such as in moderate and sticky filters)
o #134375: (by vhmauery) Postgres fix, adds orderby to groupby if there is already a groupby.
o #127099 (Crell) Fix to views argument handling in RSS that made the RSS feeds fail in panels and viewfield.
New features:
o #105620: (Attempt 2) allow modules to alter views tables + arguments
......@@ -39,7 +40,7 @@ Views 4.7.x-dev
o Allow RSS channel description to be set as part of the argument option.
o New 'tools' page in UI to clear the views cache.
o #135273: (josh_k) Allow 'edit' handler option to return to view after editing.
Views 4.7.x-1.5
Bugs fixed:
o 109456: Match API documentation on 'field' definition on fields.
......
......@@ -791,7 +791,7 @@ function views_post_view_make_url($view, $feed_id, $arg) {
// assemble the URL
$args = array();
foreach ($view->argument as $id => $argdata) {
if (isset($view->args[$id])) {
if (!empty($view->args[$id])) {
$args[] = $view->args[$id];
} else {
if ($argdata['id'] == $feed_id) {
......@@ -815,7 +815,7 @@ function views_post_view_make_args($view, $feed_id, $arg) {
// assemble the URL
$args = array();
foreach ($view->argument as $id => $argdata) {
if (isset($view->args[$id])) {
if (!empty($view->args[$id])) {
$args[] = $view->args[$id];
} else {
if ($argdata['id'] == $feed_id) {
......
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