From df4226866779f75eacab7f62da36b22dc21d5e44 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 23:42:26 +0000
Subject: Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to
 plugins like groups and wire)

git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/twitter/views/default/widgets/twitter/view.php | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'mod/twitter')

diff --git a/mod/twitter/views/default/widgets/twitter/view.php b/mod/twitter/views/default/widgets/twitter/view.php
index 4ae0d7f27..3fba5b54d 100644
--- a/mod/twitter/views/default/widgets/twitter/view.php
+++ b/mod/twitter/views/default/widgets/twitter/view.php
@@ -1,5 +1,6 @@
-<?php    
- /**
+<?php
+
+/**
  * Elgg twitter view page
  *
  * @package ElggTwitter
@@ -8,25 +9,27 @@
  * @copyright Curverider Ltd 2008-2010
  * @link http://elgg.com/
  */
- 
- //some required params
- 
- $username = $vars['entity']->twitter_username;
- $num = $vars['entity']->twitter_num;
- 
+
+//some required params
+
+$username = $vars['entity']->twitter_username;
+$num = $vars['entity']->twitter_num;
+
 // if the twitter username is empty, then do not show
-if($username){
-	 
+if ($username) {
+
 ?>
 
 <div id="twitter_widget">
-<ul id="twitter_update_list"></ul>
-<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
-<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
-<?php 
-    } else {
-      echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
-  }
-?>
-</div>
\ No newline at end of file
+	<ul id="twitter_update_list"></ul>
+	<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+	<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
+	<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
+</div>
+
+<?php
+} else {
+
+	echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
+
+}
-- 
cgit v1.2.3