Merge remote-tracking branch 'upstream/master'

1 files changed, 5 insertions, 2 deletions

diff --git a/index.php b/index.php
index 08943e4b7..14b8ca856 100755
--- a/index.php
+++ b/index.php
@@ -118,8 +118,11 @@ if(! x($_SESSION,'sysmsg_info'))
  */
 
 
-if($install)
-	$a->module = 'setup';
+if($install) {
+	/* Allow an exception for the view module so that pcss will be interpreted during installation */
+	if($a->module != 'view')
+		$a->module = 'setup';
+}
 else
 	check_config($a);