let's extend a function a bit, we love reusability.

Signed-off-by:Thorsten Eurich <thorsten@eurich.de>

sources/admin/Themes.php

@@ -361,17 +361,7 @@ public function action_options()
 				elseif ($_POST['default_options_master'][$opt] == 1)
 				{
 					// Delete then insert for ease of database compatibility!
-					$db->query('substring', '
-						DELETE FROM {db_prefix}themes
-						WHERE id_theme = {int:default_theme}
-							AND id_member != {int:no_member}
-							AND variable = SUBSTRING({string:option}, 1, 255)',
-						array(
-							'default_theme' => 1,
-							'no_member' => 0,
-							'option' => $opt,
-						)
-					);
+					removeThemeOptions(true, false, $opt);
 					addThemeOptions(1, $opt, $val);
 
 					$old_settings[] = $opt;

sources/subs/Themes.subs.php

@@ -433,8 +433,8 @@ function countConfiguredMemberOptions()
 /**
  * Deletes all outdated options from the themes table
  *
- * @param bol $default_theme -> true is default, false for all custom themes
- * @param bol $membergroups -> true is for members, false for guests
+ * @param bool $default_theme -> true is default, false for all custom themes
+ * @param bool $membergroups -> true is for members, false for guests
  * @param array $old_settings
  */
 function removeThemeOptions($default_theme, $membergroups, $old_settings)
@@ -449,12 +449,17 @@ function removeThemeOptions($default_theme, $membergroups, $old_settings)
 		$mem_param = array('operator' => '=', 'id' => -1);
 	else
 		$mem_param = array('operator' => '>', 'id' => 0);
+
+	if (is_array($old_settings))
+		$var = 'variable IN ({array_string:old_settings})';
+	else
+		$var = 'variable = {string:old_settings}';
 
 	$db->query('', '
 		DELETE FROM {db_prefix}themes
 		WHERE id_theme '. $default . ' {int:default_theme}
 			AND id_member ' . $mem_param['operator'] . ' {int:guest_member}
-			AND variable IN ({array_string:old_settings})',
+			AND ' . $var,
 		array(
 			'default_theme' => 1,
 			'guest_member' => $mem_param['id'],