From 621177abc2bc60e9edb3ca723a4afaa9d9e713ef Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 12 Dec 2009 19:51:49 +0000 Subject: convert line endings to Unix --- views/default/river/object/image/create.php | 56 ++++++++++++++--------------- views/default/river/object/image/tag.php | 44 +++++++++++------------ 2 files changed, 50 insertions(+), 50 deletions(-) (limited to 'views/default/river/object/image') diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 5229e109a..2f1777f64 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -1,29 +1,29 @@ -subject_guid); - $image = get_entity($vars['item']->object_guid); - if($image->title) { - $title = $image->title; - } else { - $title = "untitled"; - } - - $url = "getURL()}\">{$performed_by->name}"; - $album = get_entity($image->container_guid); - - $album_link = "" . $album->title . ""; - $image_link = "getURL() . "\">" . $title . ""; - - $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link); - - $string .= "
"; - -/* // this adds the album cover to the river display - $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; -*/ - $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; - $string .= "
"; - - echo $string; - +subject_guid); + $image = get_entity($vars['item']->object_guid); + if($image->title) { + $title = $image->title; + } else { + $title = "untitled"; + } + + $url = "getURL()}\">{$performed_by->name}"; + $album = get_entity($image->container_guid); + + $album_link = "" . $album->title . ""; + $image_link = "getURL() . "\">" . $title . ""; + + $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link); + + $string .= "
"; + +/* // this adds the album cover to the river display + $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; +*/ + $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; + $string .= "
"; + + echo $string; + ?> \ No newline at end of file diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php index 6e60d5af3..1b3589afb 100644 --- a/views/default/river/object/image/tag.php +++ b/views/default/river/object/image/tag.php @@ -1,23 +1,23 @@ -subject_guid); - $person_tagged = get_entity($vars['item']->object_guid); - if($image->title) { - $title = $image->title; - } else { - $title = "untitled"; - } - - // viewer may not have permission to view image - if (!$image) - return; - - - $image_url = "getURL()}\">{$title}"; - $person_url = "getURL()}\">{$person_tagged->name}"; - - $string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url; - - echo $string; - +subject_guid); + $person_tagged = get_entity($vars['item']->object_guid); + if($image->title) { + $title = $image->title; + } else { + $title = "untitled"; + } + + // viewer may not have permission to view image + if (!$image) + return; + + + $image_url = "getURL()}\">{$title}"; + $person_url = "getURL()}\">{$person_tagged->name}"; + + $string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url; + + echo $string; + ?> \ No newline at end of file -- cgit v1.2.3