Merged Cash's bugfixes from the 1.7 branch (3288:5377).

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

3 files changed, 9 insertions, 6 deletions

diff --git a/mod/groups/views/default/forms/forums/addpost.php b/mod/groups/views/default/forms/forums/addpost.php
index 8aa316caa..3ad3de0ff 100644
--- a/mod/groups/views/default/forms/forums/addpost.php
+++ b/mod/groups/views/default/forms/forums/addpost.php
@@ -29,6 +29,6 @@
 	<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
 			
 	<?php echo elgg_view('input/securitytoken'); ?>
-	<!-- display the save button -->
+	<!-- display the post button -->
 	<input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
-</form>
\ No newline at end of file
+</form>
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index e3bc3e1c6..9dd70d7a8 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -99,7 +99,7 @@
 	<!-- required hidden info and submit button -->
 	<p>
 		<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
-		<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+		<input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
 	</p>
 
 </form>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 810c29bc9..3712add82 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -138,19 +138,22 @@
 
 </form>
 
+<?php
+if ($vars['entity']) {
+?>
 <div class="delete_group">
 	<form action="<?php echo $vars['url'] . "action/groups/delete"; ?>">
 		<?php
 			echo elgg_view('input/securitytoken');
-			if ($vars['entity']) { 
 				$warning = elgg_echo("groups:deletewarning");
 			?>
 			<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
 			<input type="submit" class="action_button disabled" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php 
-			}
 		?>
 	</form>
 </div>
-
+<?php
+}
+?>