From 152405d1b34b8ba1a27b288eba53bb29ed2bf228 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 5 Jun 2008 08:45:31 +0000
Subject: Installation and initial account creation should now be stable.

git-svn-id: https://code.elgg.org/elgg/trunk@800 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/systemsettings/install.php       | 2 ++
 engine/lib/elgglib.php                   | 4 ++++
 install.php                              | 2 +-
 views/default/account/forms/register.php | 2 +-
 views/default/settings/system.php        | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 8a0346d74..1587388bb 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -23,6 +23,8 @@
 			$site->access_id = 2; // The site is public
 			$site->save();
 			
+			datalist_set('installed',time());
+			
 			datalist_set('path',get_input('path'));
 			datalist_set('dataroot',get_input('dataroot'));
 			
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e18feb398..e07d59162 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -906,6 +906,10 @@
 		function datalist_get($name) {
 			
 			global $CONFIG;
+			
+			// We need this, because sometimes datalists are received before the database is created
+			if (!is_db_installed()) return false;
+			
 			$name = sanitise_string($name);
 			if ($row = get_data_row("select value from {$CONFIG->dbprefix}datalists where name = '{$name}'")) {
 				return $row->value;
diff --git a/install.php b/install.php
index 63ac69d16..8fbda43c2 100644
--- a/install.php
+++ b/install.php
@@ -20,7 +20,7 @@
 	/**
 	 * If we're installed, go back to the homepage
 	 */
-		if (is_installed() && is_db_installed())
+		if ((is_installed() && is_db_installed() && datalist_get('installed')))
 			forward("index.php");
 		
 	/**
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 5b9a131e5..ff4ab6dc1 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -15,7 +15,7 @@
 
 	<h2><?php echo elgg_echo('register'); ?></h2>
 	<div id="register-box">
-		<form action="<?php echo $vars['url']; ?>action_handler.php" method="POST">
+		<form action="<?php echo $vars['url']; ?>action/register" method="POST">
 			<p><label><?php echo elgg_echo('name'); ?><br /><input name="name" type="text" class="general-textarea" /></label><br />
 			<label><?php echo elgg_echo('email'); ?><br /><input name="email" type="text" class="general-textarea" /></label><br />
 			<label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label><br />
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 1d2d19c67..5f4e36f1e 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -33,7 +33,7 @@
 		<p>
 			<?php echo elgg_echo($field); ?><br />
 			<?php 
-				echo elgg_view("input/text",array('internalname' => $field, 'value' => $vars[$field])); 
+				echo elgg_view("input/text",array('internalname' => $field, 'value' => $vars['config']->$field)); 
 			?>
 		</p>
 	
-- 
cgit v1.2.3