aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-06-04 11:38:54 +0000
committerCash Costello <cash.costello@gmail.com>2009-06-04 11:38:54 +0000
commitee733ee32b08e062ab868a3b26c3cbe73852a28e (patch)
tree5080cb476b1ed07ee5ec15f2e2480c8a3fd5ae80 /views/default
parent1447a6c7d8c821e2ad34145ade26376a5c9b2a03 (diff)
downloadelgg-ee733ee32b08e062ab868a3b26c3cbe73852a28e.tar.gz
elgg-ee733ee32b08e062ab868a3b26c3cbe73852a28e.tar.bz2
1. only supporting Elgg 1.5 and greater now - river code
2. fixed a bug with river code and adding single images to activity
Diffstat (limited to 'views/default')
-rw-r--r--views/default/river/object/album/annotate.php13
-rw-r--r--views/default/river/object/album/create.php13
-rw-r--r--views/default/river/object/image/annotate.php13
-rw-r--r--views/default/river/object/image/create.php13
4 files changed, 1 insertions, 51 deletions
diff --git a/views/default/river/object/album/annotate.php b/views/default/river/object/album/annotate.php
deleted file mode 100644
index 691b0c7ec..000000000
--- a/views/default/river/object/album/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
- $statement = $vars['statement'];
- $performed_by = $statement->getSubject();
- $object = $statement->getObject();
-
- $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("album:river:annotate"),$url) . " ";
- $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("album:river:item") . "</a>";
-
- echo $string;
-
-?> \ No newline at end of file
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 300062b5a..40f847c78 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,6 +1,5 @@
<?php
-if (function_exists('add_to_river')) { // Elgg 1.5
$performed_by = get_entity($vars['item']->subject_guid);
$album = get_entity($vars['item']->object_guid);
@@ -11,17 +10,7 @@ if (function_exists('add_to_river')) { // Elgg 1.5
if ($album->cover) {
$string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover" alt="thumbnail"/>' . "</div>";
}
-
-} else { // Elgg 1.2
- $statement = $vars['statement'];
- $performed_by = $statement->getSubject();
- $object = $statement->getObject();
-
- $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("album:river:created"),$url) . " ";
- $string .= "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-}
echo $string;
-
+
?>
diff --git a/views/default/river/object/image/annotate.php b/views/default/river/object/image/annotate.php
deleted file mode 100644
index b0b1b8719..000000000
--- a/views/default/river/object/image/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
- $statement = $vars['statement'];
- $performed_by = $statement->getSubject();
- $object = $statement->getObject();
-
- $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("image:river:annotate"),$url) . " ";
- $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("image:river:item") . "</a>";
-
- echo $string;
-
-?> \ No newline at end of file
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index bf6d2acbb..09320080b 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,6 +1,5 @@
<?php
-if (function_exists('add_to_river')) { // Elgg 1.5
$performed_by = get_entity($vars['item']->subject_guid);
$image = get_entity($vars['item']->object_guid);
if($image->title) {
@@ -23,17 +22,5 @@ if (function_exists('add_to_river')) { // Elgg 1.5
$string .= "</div>";
echo $string;
-
-} else {
- $statement = $vars['statement'];
- $performed_by = $statement->getSubject();
- $object = $statement->getObject();
-
- $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("image:river:created"),$url) . " ";
- $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("image:river:item") . "</a>";
- echo $string;
-}
-
?> \ No newline at end of file