Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css

1 files changed, 12 insertions, 6 deletions

diff --git a/install.php b/install.php
index 47c277ff..8453d2ae 100644
--- a/install.php
+++ b/install.php
@@ -658,18 +658,18 @@ if ($step == 0) {
 			$sql_errors .= '<li>' . db_error() . '</li>';
 	}
 	
-	$boards = listBoards();
-	foreach ($boards as &$_board) {
-		setupBoard($_board);
-		buildIndex();
-	}
-	
 	$page['title'] = 'Installation complete';
 	$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover. <a href="http://tinyboard.org/docs/?p=Config">How do I edit the config files?</a></p>';
 	
 	if (!empty($sql_errors)) {
 		$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a Tinyboard installation; if so, you can probably ignore this.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';
 	} else {
+		$boards = listBoards();
+		foreach ($boards as &$_board) {
+			setupBoard($_board);
+			buildIndex();
+		}
+		
 		file_write($config['has_installed'], VERSION);
 		if (!file_unlink(__FILE__)) {
 			$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
@@ -681,6 +681,12 @@ if ($step == 0) {
 	$page['title'] = 'Installation complete';
 	$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover.</p>';
 	
+	$boards = listBoards();
+	foreach ($boards as &$_board) {
+		setupBoard($_board);
+		buildIndex();
+	}
+	
 	file_write($config['has_installed'], VERSION);
 	if (!file_unlink(__FILE__)) {
 		$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';