aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/activity/all.php6
-rw-r--r--mod/activity/index.php9
2 files changed, 10 insertions, 5 deletions
diff --git a/mod/activity/all.php b/mod/activity/all.php
index cd19a7507..e4252c2ec 100644
--- a/mod/activity/all.php
+++ b/mod/activity/all.php
@@ -23,8 +23,10 @@
if (elgg_get_viewtype()=='opendd'){
$body = elgg_view('activity/dashboard', array('activity' => activity_get_activity_opendd($limit, $offset, $type, $subtype)));
}else{
- $body = elgg_view('activity/dashboard', array('activity' => activity_get_activity($limit, $offset, $type, $subtype)));
- $body .= elgg_view('activity/offset', array('offset' => $offset));
+ $activity = activity_get_activity($limit, $offset, $type, $subtype);
+ $body = elgg_view('activity/dashboard', array('activity' => $activity));
+ if (count($activity))
+ $body .= elgg_view('activity/offset', array('offset' => $offset));
}
page_draw(elgg_echo('activity:all'),elgg_view_layout("two_column_left_sidebar", '', $title . $body));
diff --git a/mod/activity/index.php b/mod/activity/index.php
index 583edf555..57ec5ae88 100644
--- a/mod/activity/index.php
+++ b/mod/activity/index.php
@@ -24,9 +24,12 @@
if (elgg_get_viewtype()=='opendd')
$body = elgg_view('activity/dashboard', array('activity' => activity_get_activity_opendd($limit, $offset, $type, $subtype, page_owner())));
- else
- $body = elgg_view('activity/dashboard', array('activity' => activity_get_activity($limit, $offset, $type, $subtype, page_owner())));
- $body .= elgg_view('activity/offset', array('offset' => $offset, 'add_to_url' => 'own'));
+ else {
+ $activity = activity_get_activity($limit, $offset, $type, $subtype, page_owner());
+ $body = elgg_view('activity/dashboard', array('activity' => $activity));
+ if (count($activity))
+ $body .= elgg_view('activity/offset', array('offset' => $offset, 'add_to_url' => 'own'));
+ }
}
else