Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/system.inc

1 files changed, 8 insertions, 4 deletions

diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 3bb68cf..c1fdc26 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -42,6 +42,9 @@
 ##|*MATCH=index.php*
 ##|-PRIV
 
+// Turn off csrf for the dashboard
+$nocsrf = true; 
+
 // Turn on buffering to speed up rendering
 ini_set('output_buffering','true');
 
@@ -107,14 +110,15 @@ if (!is_array($config['widgets'])) {
 	## User recently restored his config.
 	## If packages are installed lets resync
 	if(file_exists('/conf/needs_package_sync')) {
-		if($config['installedpackages'] <> '') {
-			conf_mount_rw();
-			@unlink('/conf/needs_package_sync');
-			conf_mount_ro();
+		if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
 			if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
 				header('Location: pkg_mgr_install.php?mode=reinstallall');
 				exit;
 			}
+		} else {
+			conf_mount_rw();
+			@unlink('/conf/needs_package_sync');
+			conf_mount_ro();
 		}
 	}