Converting all line endings to unix style.

git-svn-id: http://code.elgg.org/elgg/trunk@5512 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 49 insertions, 49 deletions

diff --git a/views/default/annotation/annotatelike.php b/views/default/annotation/annotatelike.php
index 7c7b1887a..08bac55ae 100644
--- a/views/default/annotation/annotatelike.php
+++ b/views/default/annotation/annotatelike.php
@@ -1,11 +1,11 @@
-<?php

-

-$performed_by = get_entity($vars['item']->subject_guid);

-$object = get_entity($vars['item']->object_guid);

-$url = $object->getURL();

-$title = $object->title;

- 

-$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";

-$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created);

-	

+<?php
+
+$performed_by = get_entity($vars['item']->subject_guid);
+$object = get_entity($vars['item']->object_guid);
+$url = $object->getURL();
+$title = $object->title;
+ 
+$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
+$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created);
+	
 echo $string;
\ No newline at end of file
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 8b3505482..4cf27e82b 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -1,40 +1,40 @@
-<?php

-/**

- * Elgg show the user who liked the object

- */

-

-$owner = get_user($vars['annotation']->owner_guid);

-

-?>

-<div class="elgg_likes clearfloat">

-	<div class="elgg_likes_icon">

-		<?php

-			echo elgg_view("profile/icon", array(

-					'entity' => $owner,

-					'size' => 'tiny'

-					));

-		?>

-	</div>

-	

-	<div class="elgg_likes_details">

-		<?php

-		// if the user looking at the like listing can edit, show the delete link

-		if ($vars['annotation']->canEdit()) {

-		?>

-			<span class="delete_button">

-				<?php echo elgg_view("output/confirmlink",array(

-						'href' => $vars['url'] . "action/likes/delete?annotation_id=" . $vars['annotation']->id,

-						'text' => elgg_echo('remove'),

-						'confirm' => elgg_echo('deleteconfirm')

-						));

-				?>

-			</span>

-		<?php

-			} //end of can edit if statement

-		?>

-		<p class="elgg_likes_owner">

-			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') . 

-			" <span class=\"entity_subtext\">" . friendly_time($vars['annotation']->time_created) . "</span>"; ?> 

-		</p>

-	</div>

+<?php
+/**
+ * Elgg show the user who liked the object
+ */
+
+$owner = get_user($vars['annotation']->owner_guid);
+
+?>
+<div class="elgg_likes clearfloat">
+	<div class="elgg_likes_icon">
+		<?php
+			echo elgg_view("profile/icon", array(
+					'entity' => $owner,
+					'size' => 'tiny'
+					));
+		?>
+	</div>
+	
+	<div class="elgg_likes_details">
+		<?php
+		// if the user looking at the like listing can edit, show the delete link
+		if ($vars['annotation']->canEdit()) {
+		?>
+			<span class="delete_button">
+				<?php echo elgg_view("output/confirmlink",array(
+						'href' => $vars['url'] . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
+						'text' => elgg_echo('remove'),
+						'confirm' => elgg_echo('deleteconfirm')
+						));
+				?>
+			</span>
+		<?php
+			} //end of can edit if statement
+		?>
+		<p class="elgg_likes_owner">
+			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') . 
+			" <span class=\"entity_subtext\">" . friendly_time($vars['annotation']->time_created) . "</span>"; ?> 
+		</p>
+	</div>
 </div>
\ No newline at end of file