diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-11-03 18:27:17 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-11-03 18:27:17 -0700 |
| commit | 67d692b76b079a75a0ad7ca1fb73ce6333a61789 (patch) | |
| tree | 13937d1d76788be7b397ebbe92ba89e2e6c89525 /engine | |
| parent | 9c0c10ee6d9261d3d1d502e5ca1f86555a96105a (diff) | |
| parent | 7250d1904f87af146223cd7be57660791cbb6ef8 (diff) | |
| download | elgg-67d692b76b079a75a0ad7ca1fb73ce6333a61789.tar.gz elgg-67d692b76b079a75a0ad7ca1fb73ce6333a61789.tar.bz2 | |
Merge pull request #90 from cash/walled_garden
Fixes #3756 creates a more flexible walled garden login area
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/elgglib.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 66268cc96..a6f5fbc6f 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1990,10 +1990,12 @@ function elgg_is_valid_options_for_batch_operation($options, $type) { function elgg_walled_garden_index() { elgg_register_css('elgg.walled_garden', '/css/walled_garden.css'); elgg_load_css('elgg.walled_garden'); + elgg_register_js('elgg.walled_garden', '/js/walled_garden.js'); + elgg_load_js('elgg.walled_garden'); - $login = elgg_view('core/account/login_walled_garden'); + $body = elgg_view('core/walled_garden/body'); - echo elgg_view_page('', $login, 'walled_garden'); + echo elgg_view_page('', $body, 'walled_garden'); // return true to prevent other plugins from adding a front page return true; |