update for 3.0.20

benkeen · benkeen · commit a4fb1d1884ef · 2019-10-19T19:10:46.000-07:00
diff --git a/src/admin/modules/index.php b/src/admin/modules/index.php
@@ -50,7 +50,11 @@
 // Hacky patch. Longer term plan, see: https://github.com/formtools/core/issues/82
 $localized_modules = array();
 foreach ($modules as $module_info) {
-	$module = Modules::getModuleInstance($module_info["module_folder"]);
+	$module_folder = $module_info["module_folder"];
+	if (!Modules::isValidModule($module_folder)) {
+		continue;
+	}
+	$module = Modules::getModuleInstance($module_folder);
 	$module_info["module_name"] = $module->getModuleName();
 	$module_info["description"] = $module->getModuleDesc();
 	$localized_modules[] = $module_info;
diff --git a/src/global/code/Core.class.php b/src/global/code/Core.class.php
@@ -263,7 +263,7 @@ class Core
 	/**
 	 * The current version of the Form Tools Core.
 	 */
-	private static $version = "3.0.19";
+	private static $version = "3.0.20";
 
 	/**
 	 * The release type: alpha, beta or main
@@ -273,7 +273,7 @@ class Core
 	/**
 	 * The release date: YYYYMMDD
 	 */
-	private static $releaseDate = "20191014";
+	private static $releaseDate = "20191019";
 
 	/**
 	 * The minimum required PHP version needed to run Form Tools.
diff --git a/src/install/actions-installation.php b/src/install/actions-installation.php
@@ -253,6 +253,7 @@
 			Sessions::set("fti.accountCreated", true);
 
 			// now set up the remainder of the script
+			Installation::updateDatabaseSettings();
 			Hooks::updateAvailableHooks();
 			Modules::updateModuleList();
 			Themes::updateThemeList();
diff --git a/src/install/index.php b/src/install/index.php
@@ -24,9 +24,7 @@
 <head>
     <title><?php echo $LANG["phrase_ft_installation"]; ?></title>
     <link rel="Form Tools icon" href="../themes/default/images/favicon.ico">
-    <?php if (!Core::isDevMode()) { ?>
     <link rel="stylesheet" href="../react/main.css">
-    <?php } ?>
 </head>
 <body>
     <div id="root"></div>
diff --git a/webpack.config.js b/webpack.config.js
@@ -26,7 +26,7 @@ const config = (env) => {
 				{
 					test: /\.scss$/,
 					use: [
-						isDev ? 'style-loader' : MiniCssExtractPlugin.loader,
+						MiniCssExtractPlugin.loader,
 						{
 							loader: 'css-loader',
 							options: {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const config = (env) => {`
`26`	`26`	`{`
`27`	`27`	`test: /\.scss$/,`
`28`	`28`	`use: [`
`29`		`- isDev ? 'style-loader' : MiniCssExtractPlugin.loader,`
	`29`	`+ MiniCssExtractPlugin.loader,`
`30`	`30`	`{`
`31`	`31`	`loader: 'css-loader',`
`32`	`32`	`options: {`