From 9c7c23c87b8b36f13be6b1265c563443679acc90 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 4 Mar 2006 17:49:21 +0000
Subject: [PATCH] - Patch #52431 by Zen: simplified some code.

---
 modules/system.module        | 8 ++------
 modules/system/system.module | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/system.module b/modules/system.module
index ad30b5f5f8..e93684cdb2 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -740,14 +740,10 @@ function system_theme_settings_submit($form_id, $values) {
 
   if ($op == t('Reset to defaults')) {
     variable_del($key);
-  }
-  else {
-    variable_set($key, $values);
-  }
-  if ($op == t('Reset to defaults')) {
     drupal_set_message(t('The configuration options have been reset to their default values.'));
   }
   else {
+    variable_set($key, $values);
     drupal_set_message(t('The configuration options have been saved.'));
   }
 }
@@ -874,7 +870,7 @@ function system_themes_submit($form_id, $values) {
   }
   else {
     variable_del('theme_default');
-    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name ='bluemarine'");
+    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'bluemarine'");
   }
 
   menu_rebuild();
diff --git a/modules/system/system.module b/modules/system/system.module
index ad30b5f5f8..e93684cdb2 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -740,14 +740,10 @@ function system_theme_settings_submit($form_id, $values) {
 
   if ($op == t('Reset to defaults')) {
     variable_del($key);
-  }
-  else {
-    variable_set($key, $values);
-  }
-  if ($op == t('Reset to defaults')) {
     drupal_set_message(t('The configuration options have been reset to their default values.'));
   }
   else {
+    variable_set($key, $values);
     drupal_set_message(t('The configuration options have been saved.'));
   }
 }
@@ -874,7 +870,7 @@ function system_themes_submit($form_id, $values) {
   }
   else {
     variable_del('theme_default');
-    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name ='bluemarine'");
+    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'bluemarine'");
   }
 
   menu_rebuild();
-- 
GitLab