Upgraded to Elgg 1.8.4.

3 files changed, 14 insertions, 8 deletions

diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index 5155fc415..b935090f0 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -19,6 +19,12 @@ foreach (array('wwwroot', 'path', 'dataroot') as $field) {
 $form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
 $form_body .= "<label>" . elgg_echo('installation:sitepermissions') . "</label>";
 $form_body .= elgg_view('input/access', array(
+	'options_values' => array(
+		ACCESS_PRIVATE => elgg_echo("PRIVATE"),
+		ACCESS_FRIENDS => elgg_echo("access:friends:label"),
+		ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"),
+		ACCESS_PUBLIC => elgg_echo("PUBLIC")
+	),
 	'name' => 'default_access',
 	'value' => elgg_get_config('default_access'),
 )) . "</div>";
@@ -34,11 +40,11 @@ $form_body .= elgg_view("input/checkboxes", array(
 	'name' => 'simplecache_enabled',
 	'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
 )) . "</div>";
-$form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:systemcache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:viewpathcache:label') => elgg_echo('installation:viewpathcache:label')),
-	'name' => 'viewpath_cache_enabled',
-	'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
+	'options' => array(elgg_echo('installation:systemcache:label') => elgg_echo('installation:systemcache:label')),
+	'name' => 'system_cache_enabled',
+	'value' => (elgg_get_config('system_cache_enabled') ? elgg_echo('installation:systemcache:label') : ""),
 )) . "</div>";
 
 $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));
@@ -95,4 +101,4 @@ $form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 $form_body .= '</div>';
 
-echo $form_body;
\ No newline at end of file
+echo $form_body;
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 6f6cc9906..d2c6e6221 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -20,7 +20,7 @@
 	<?php echo elgg_view('input/password', array('name' => 'password')); ?>
 </div>
 
-<?php echo elgg_view('login/extend'); ?>
+<?php echo elgg_view('login/extend', $vars); ?>
 
 <div class="elgg-foot">
 	<label class="mtm float-alt">
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 411152205..75ecd3450 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -66,10 +66,10 @@ if (elgg_is_sticky_form('register')) {
 
 <?php
 // view to extend to add more fields to the registration form
-echo elgg_view('register/extend');
+echo elgg_view('register/extend', $vars);
 
 // Add captcha hook
-echo elgg_view('input/captcha');
+echo elgg_view('input/captcha', $vars);
 
 echo '<div class="elgg-foot">';
 echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));