From f66aba4103148145034045eb7cc4e89c533088f5 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 23 May 2008 12:31:57 +0000
Subject: Removing conflict over 'event' keyword in views

git-svn-id: https://code.elgg.org/elgg/trunk@696 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 7a842cfd1..68d760202 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -96,8 +96,11 @@
 		    if (isset($_SESSION) && is_array($_SESSION) ) {
 		        $vars = array_merge($vars, $_SESSION);
 		    }
+		    $vars['config'] = array();
 			if (!empty($CONFIG))
-		    	$vars = array_merge($vars, get_object_vars($CONFIG));
+		    	$vars['config'] = $CONFIG;
+		    	
+			$vars['url'] = $CONFIG->url;
 		    	
 		// Load page owner variables into $vars
 		    if (is_callable('page_owner')) {
-- 
cgit v1.2.3