fixes #197 (comment)

ThemeFuse · Feb 17, 2015 · e925c16 · e925c16
1 parent a17cf2e
commit e925c16
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/framework/helpers/database.php b/framework/helpers/database.php
@@ -19,7 +19,11 @@ function fw_get_db_settings_option( $option_id = null, $default_value = null, $g
 			$option_id, $default_value, $get_original_value
 		);
 
-		if ( is_null( $value ) ) {
+		if (
+			(!is_null($option_id) && is_null($value)) // a specific option_id was requested
+			||
+			(is_null($option_id) && empty($value)) // all options were requested but the db value is empty (this can happen after Reset)
+		) {
 			/**
 			 * Maybe the options was never saved or the given option id does not exist
 			 * Extract the default values from the options array and try to find there the option id