aboutsummaryrefslogtreecommitdiff
path: root/views/default/core/river
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-17 01:08:23 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-17 01:08:23 +0000
commit7c7dc0e249fb4afd1b0f4826bdbd27aa5d9f2a26 (patch)
treeaa3afd1a6c4493ef463bc8c0e4d77a11942e081f /views/default/core/river
parente634e03a412afdb4f31923b91b2af8efc0bb2be0 (diff)
downloadelgg-7c7dc0e249fb4afd1b0f4826bdbd27aa5d9f2a26.tar.gz
elgg-7c7dc0e249fb4afd1b0f4826bdbd27aa5d9f2a26.tar.bz2
updated the river friend view for the new river code
git-svn-id: http://code.elgg.org/elgg/trunk@7649 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/core/river')
-rw-r--r--views/default/core/river/controls.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index 4ab087458..e239a2adb 100644
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -9,7 +9,8 @@
$object = $vars['item']->getObjectEntity();
if (isloggedin()) {
- if ($vars['item']->annotation_id == 0) {
+ // comments and non-objects cannot be commented on
+ if ($object->getType() == 'object' && $vars['item']->annotation_id == 0) {
$params = array(
'href' => '#',
'text' => elgg_echo('generic_comments:text'),