aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-04 11:04:06 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-04 11:04:06 +0000
commitda870fd1ee294b2e18b7d0021525e7ca4be49d32 (patch)
tree651c464ae3d16afaeb3fb45ca450fcc2e8b8880d
parent6d93f199ab182dcb262c2fa01d82c409757fa56c (diff)
downloadelgg-da870fd1ee294b2e18b7d0021525e7ca4be49d32.tar.gz
elgg-da870fd1ee294b2e18b7d0021525e7ca4be49d32.tar.bz2
Fixed river RSS views
git-svn-id: https://code.elgg.org/elgg/trunk@3058 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php12
-rw-r--r--views/rss/river/item/list.php3
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;
?>
<item>