diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-23 12:31:57 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-23 12:31:57 +0000 |
| commit | f66aba4103148145034045eb7cc4e89c533088f5 (patch) | |
| tree | 7b35c4c0c11f1c584958002757596d8560cd6fbc | |
| parent | bfcc243de470b4947d385ccf7f302359114ac142 (diff) | |
| download | elgg-f66aba4103148145034045eb7cc4e89c533088f5.tar.gz elgg-f66aba4103148145034045eb7cc4e89c533088f5.tar.bz2 | |
Removing conflict over 'event' keyword in views
git-svn-id: https://code.elgg.org/elgg/trunk@696 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/elgglib.php | 5 |
1 files changed, 4 insertions, 1 deletions
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')) {
|