Fixes #2640 - elgg_view_layout now uses a parameter array like all the other elgg_view* functions

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

14 files changed, 24 insertions, 16 deletions

diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 487af7e8d..57678be6d 100644
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -51,7 +51,7 @@ $area1 .= elgg_view_title(elgg_echo('groups:activity'));
 $area1 .= elgg_view("group_activity/extend");

 $area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";

 $title = elgg_echo("groups:activity", array(elgg_get_page_owner()->name));

-$body = elgg_view_layout('one_column_with_sidebar', $area1);

+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));

 

 // Finally draw the page

 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php
index 85bef8ae5..008f34d9e 100644
--- a/mod/groups/addtopic.php
+++ b/mod/groups/addtopic.php
@@ -14,7 +14,8 @@ if (!(elgg_get_page_owner() instanceof ElggGroup)) forward();
 		
 // sort the display
 $area2 = elgg_view("forms/forums/addtopic");
-$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+$content = $area1 . $area2;
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 		
 // Display page
 echo elgg_view_page(elgg_echo('groups:addtopic'),$body);
\ No newline at end of file
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 1e7b93b65..cf1a483b1 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -59,7 +59,9 @@
 		$area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	}
 	$area1 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
-	$body = elgg_view_layout('one_column_with_sidebar', $area1, $area2);
+
+	$content = $area1 . $area2;
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 	// Finally draw the page
 	echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
index ddaec0060..59064b7d8 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -23,7 +23,7 @@
 		$body .= elgg_echo('groups:noaccess');
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', $body);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
 	
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
index 03d220af0..73730904f 100644
--- a/mod/groups/edittopic.php
+++ b/mod/groups/edittopic.php
@@ -19,7 +19,7 @@ $topic = get_entity((int) get_input('topic'));
 		
 // sort the display
 $area2 = elgg_view("forms/forums/edittopic", array('entity' => $topic));
-$body = elgg_view_layout('one_column_with_sidebar', $area2);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
 		
 // Display page
 echo elgg_view_page(elgg_echo('groups:edittopic'),$body);
\ No newline at end of file
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index 376098f80..55f7dd95e 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -37,7 +37,7 @@ $area1 = elgg_view('navigation/breadcrumbs');
 $area1 .= elgg_view("forum/topics", array('topics' => $topics, 'group_guid' => $group_guid));
 elgg_set_context('groups');
 
-$body = elgg_view_layout('one_column_with_sidebar', $area1);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 
 $title = elgg_echo('item:object:groupforumtopic');
 
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index bb577fde2..e7daddb43 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -35,15 +35,20 @@
 		} else {
 			$area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => get_loggedin_user(), 'full' => true));
 		}
-		
-		$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
+
+		$content = $area1 . $area2;
+		$params = array(
+			'content' => $content,
+			'sidebar' => $area3
+		);
+		$body = elgg_view_layout('one_column_with_sidebar', $params);
 	} else {
 		$title = elgg_echo('groups:notfound');
 		
 		$area2 = elgg_view_title($title);
 		$area2 .= "<p class='margin_top'>".elgg_echo('groups:notfound:details')."</p>";
 		
-		$body = elgg_view_layout('one_column_with_sidebar', $area2);
+		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
 	}
 		
 	// Finally draw the page
diff --git a/mod/groups/index.php b/mod/groups/index.php
index 457d2eb55..a8c81b27e 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -20,7 +20,7 @@
 	elgg_pop_context();
 	
 	$area1 .= $objects;
-	$body = elgg_view_layout('one_column_with_sidebar', $area1);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 	
 	// Finally draw the page
 	echo elgg_view_page($title, $body);
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php
index 837534f99..6a187a8fa 100644
--- a/mod/groups/invitations.php
+++ b/mod/groups/invitations.php
@@ -26,6 +26,6 @@ if ($user) {
 	$area2 .= elgg_echo("groups:noaccess");
 }
 
-$body = elgg_view_layout('one_column_with_sidebar', $area2);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/groups/invite.php b/mod/groups/invite.php
index 48dfea58b..acc54b15d 100644
--- a/mod/groups/invite.php
+++ b/mod/groups/invite.php
@@ -24,7 +24,7 @@
 		$area2 .= elgg_echo("groups:noaccess");
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1 . $area2));
 	
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index dd5fd675b..8eea0b6bb 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -27,7 +27,7 @@
 	elgg_pop_context();
 	
 	$area2 .= $objects;
-	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1. $area2));
 	
 	// Finally draw the page
 	echo elgg_view_page($title, $body);
diff --git a/mod/groups/membershipreq.php b/mod/groups/membershipreq.php
index e37825e74..4ce2a6b7d 100644
--- a/mod/groups/membershipreq.php
+++ b/mod/groups/membershipreq.php
@@ -26,7 +26,7 @@
 		$area2 .= elgg_echo("groups:noaccess");
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1 . $area2));
 	
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
index 4f8179e58..84d1539af 100644
--- a/mod/groups/new.php
+++ b/mod/groups/new.php
@@ -14,7 +14,7 @@
 	$area2 = elgg_view_title($title);
 	$area2 .= elgg_view("forms/groups/edit");
 	
-	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1 . $area2));
 	
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
index 0673156f1..fe9b85cec 100644
--- a/mod/groups/topicposts.php
+++ b/mod/groups/topicposts.php
@@ -25,7 +25,7 @@
          
     // Display them
 	    $area2 = elgg_view("forum/viewposts", array('entity' => $topic));
-	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
+	    $body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
 		
 	// Display page
 		echo elgg_view_page($topic->title,$body);