fix fatal errors. works with v0.9.6

1 files changed, 71 insertions, 71 deletions

diff --git a/tools/rebuild.php b/tools/rebuild.php
index 1560893c..3b5c0de2 100755
--- a/tools/rebuild.php
+++ b/tools/rebuild.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php
 <?php
+
 /*
  *  rebuild.php - rebuilds all static files
  * 
@@ -17,89 +18,88 @@
  *          Rebuild replies as well as threads (re-markup).
  *
  */
- 
-	require dirname(__FILE__) . '/inc/cli.php';
-	
-	if(!is_writable($config['file_script'])) {
-		get_httpd_privileges();
-	}
-	
-	$start = microtime(true);
-	
-	// parse command line
-	$opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet'));
-	$options = Array();
-	
-	$options['board'] = isset($opts['board']) ? $opts['board'] : (isset($opts['b']) ? $opts['b'] : false);
-	$options['quiet'] = isset($opts['q']) || isset($opts['quiet']);
-	$options['quick'] = isset($opts['quick']);
-	$options['full'] = isset($opts['full']) || isset($opts['f']);
+
+require dirname(__FILE__) . '/inc/cli.php';
+
+if(!is_writable($config['file_script'])) {
+	get_httpd_privileges();
+}
+
+$start = microtime(true);
+
+// parse command line
+$opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet'));
+$options = Array();
+
+$options['board'] = isset($opts['board']) ? $opts['board'] : (isset($opts['b']) ? $opts['b'] : false);
+$options['quiet'] = isset($opts['q']) || isset($opts['quiet']);
+$options['quick'] = isset($opts['quick']);
+$options['full'] = isset($opts['full']) || isset($opts['f']);
+
+if(!$options['quiet'])
+	echo "== Tinyboard {$config['version']} ==\n";	
+
+if(!$options['quiet'])
+	echo "Clearing template cache...\n";
+
+load_twig();
+$twig->clearCacheFiles();
+
+if(!$options['quiet'])
+	echo "Regenerating theme files...\n";
+rebuildThemes('all');
+
+if(!$options['quiet'])
+	echo "Generating Javascript file...\n";
+buildJavascript();
+
+$main_js = $config['file_script'];
+
+$boards = listBoards();
+
+foreach($boards as &$board) {
+	if($options['board'] && $board['uri'] != $options['board'])
+		continue;
 	
 	if(!$options['quiet'])
-		echo "== Tinyboard {$config['version']} ==\n";	
+		echo "Opening board /{$board['uri']}/...\n";
+	openBoard($board['uri']);
 	
-	if(!$options['quiet'])
-		echo "Clearing template cache...\n";
-	$twig = new Twig_Environment($loader, Array(
-		'cache' => "{$config['dir']['template']}/cache"
-	));
-	$twig->clearCacheFiles();
+	if($config['file_script'] != $main_js) {
+		// different javascript file
+		if(!$options['quiet'])
+			echo "Generating Javascript file...\n";
+		buildJavascript();
+	}
 	
-	if(!$options['quiet'])
-		echo "Regenerating theme files...\n";
-	rebuildThemes('all');
 	
 	if(!$options['quiet'])
-		echo "Generating Javascript file...\n";
-	buildJavascript();
+		echo "Creating index pages...\n";
+	buildIndex();
 	
-	$main_js = $config['file_script'];
+	if($options['quick'])
+		continue; // do no more
 	
-	$boards = listBoards();
-	
-	foreach($boards as &$board) {
-		if($options['board'] && $board['uri'] != $options['board'])
-			continue;
-		
-		if(!$options['quiet'])
-			echo "Opening board /{$board['uri']}/...\n";
-		openBoard($board['uri']);
-		
-		if($config['file_script'] != $main_js) {
-			// different javascript file
-			if(!$options['quiet'])
-				echo "Generating Javascript file...\n";
-			buildJavascript();
-		}
-		
-		
-		if(!$options['quiet'])
-			echo "Creating index pages...\n";
-		buildIndex();
-		
-		if($options['quick'])
-			continue; // do no more
-		
-		if($options['full']) {
-			$query = query(sprintf("SELECT `id` FROM `posts_%s`", $board['uri'])) or error(db_error());
-			while($post = $query->fetch()) {
-				if(!$options['quiet'])
-					echo "Rebuilding #{$post['id']}...\n";
-				rebuildPost($post['id']);
-			}
-		}
-		
-		$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+	if($options['full']) {
+		$query = query(sprintf("SELECT `id` FROM `posts_%s`", $board['uri'])) or error(db_error());
 		while($post = $query->fetch()) {
 			if(!$options['quiet'])
 				echo "Rebuilding #{$post['id']}...\n";
-			buildThread($post['id']);
+			rebuildPost($post['id']);
 		}
 	}
 	
-	if(!$options['quiet'])
-		printf("Complete! Took %g seconds\n", microtime(true) - $start);
-	
-	unset($board);
-	modLog('Rebuilt everything using tools/rebuild.php');
+	$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+	while($post = $query->fetch()) {
+		if(!$options['quiet'])
+			echo "Rebuilding #{$post['id']}...\n";
+		buildThread($post['id']);
+	}
+}
+
+if(!$options['quiet'])
+	printf("Complete! Took %g seconds\n", microtime(true) - $start);
+
+unset($board);
+modLog('Rebuilt everything using tools/rebuild.php');