From da870fd1ee294b2e18b7d0021525e7ca4be49d32 Mon Sep 17 00:00:00 2001 From: ben Date: Wed, 4 Mar 2009 11:04:06 +0000 Subject: Fixed river RSS views git-svn-id: https://code.elgg.org/elgg/trunk@3058 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 12 +++++++----- views/rss/river/item/list.php | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 8f3196482..3b7735f9f 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -133,13 +133,15 @@ /** * Return the location of a given view. * - * @param string $view The view. + * @param string $view The view. + * @param string $viewtype The viewtype */ - function elgg_get_view_location($view) + function elgg_get_view_location($view, $viewtype = '') { global $CONFIG; - - $viewtype = elgg_get_viewtype(); + + if (empty($viewtype)) + $viewtype = elgg_get_viewtype(); if (!isset($CONFIG->views->locations[$viewtype][$view])) { if (!isset($CONFIG->viewpath)) { @@ -314,7 +316,7 @@ foreach($viewlist as $priority => $view) { - $view_location = elgg_get_view_location($view); + $view_location = elgg_get_view_location($view, $viewtype); if (file_exists($view_location . "{$viewtype}/{$view}.php") && !include($view_location . "{$viewtype}/{$view}.php")) { $success = false; diff --git a/views/rss/river/item/list.php b/views/rss/river/item/list.php index 6e2a33278..0ca5f7810 100644 --- a/views/rss/river/item/list.php +++ b/views/rss/river/item/list.php @@ -17,7 +17,8 @@ } else { $url = $vars['url']; } - $title = strip_tags($body); + //$title = strip_tags($body); + $title = $item->view; ?> -- cgit v1.2.3