From b6aaba915151dd07800761a01b67ffffaee1302b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 14 May 2010 20:01:59 +0000
Subject: merge -r5898:5928 (not excluding riverdashboard, notifications, and
 messageboard) from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/invitefriends/form.php           | 31 +++++++++++-----------
 .../views/default/invitefriends/formitems.php      | 18 ++++++-------
 2 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'mod/invitefriends/views/default')

diff --git a/mod/invitefriends/views/default/invitefriends/form.php b/mod/invitefriends/views/default/invitefriends/form.php
index ef66c1e84..ed8fa2d15 100644
--- a/mod/invitefriends/views/default/invitefriends/form.php
+++ b/mod/invitefriends/views/default/invitefriends/form.php
@@ -1,18 +1,17 @@
 <?php
-	/**
-	 * Elgg invite page
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @link http://elgg.org/
-	 */
-	echo elgg_view('input/form', array(
-			'action' => $vars['url'] . 'action/invitefriends/invite',
-			'body' => elgg_view('invitefriends/formitems'),
-			'method' => 'post'
-		)
-	);
+/**
+ * Elgg invite form wrapper
+ *
+ * @package ElggInviteFriends
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @link http://elgg.org/
+ */
 
-?>
+echo elgg_view('input/form', array(
+								'action' => $vars['url'] . 'action/invitefriends/invite',
+								'body' => elgg_view('invitefriends/formitems'),
+								'method' => 'post'
+								)
+);
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index 875287821..ce9a84073 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -1,14 +1,14 @@
 <?php
 
-	/**
-	 * Elgg invite page
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg invite form contents
+ *
+ * @package ElggInviteFriends
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @link http://elgg.org/
+ */
 
 
 echo "<h2>".elgg_echo('friends:invite')."</h2>";
-- 
cgit v1.2.3