diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-10 13:30:57 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-10 13:30:57 +0000 |
| commit | 65001decf7a36cffd077575229b4dd9239a48315 (patch) | |
| tree | b9dbd6171c556f56950af654669db914f0f08ad4 | |
| parent | b6b7331c0a548ed1131c1b0ad2f37ad8ce9fb967 (diff) | |
| download | elgg-65001decf7a36cffd077575229b4dd9239a48315.tar.gz elgg-65001decf7a36cffd077575229b4dd9239a48315.tar.bz2 | |
Marcus Povey <marcus@elgg.com>
* Pagination not displayed when no activity present
* OpenDD link for your activity now functioning
git-svn-id: https://code.elgg.org/elgg/trunk@2703 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/activity/all.php | 6 | ||||
| -rw-r--r-- | mod/activity/index.php | 9 |
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 |