- Fixed bug #9948: added some checks to system_setting_save() to avoid PHP warnings/errors.

1 files changed, 8 insertions, 5 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index dc0b6bba0..332cea9f8 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -530,21 +530,24 @@ function system_settings_save() {
   $edit = $_POST['edit'];
 
   if ($op == t('Reset to defaults')) {
-    foreach ($edit as $name => $value) {
-      variable_del($name);
+    if (is_array($edit)) {
+      foreach ($edit as $name => $value) {
+        variable_del($name);
+      }
     }
     drupal_set_message(t('The configuration options have been reset to their default values.'));
   }
   if ($op == t('Save configuration')) {
-    foreach ($edit as $name => $value) {
-      variable_set($name, $value);
+    if (is_array($edit)) {
+      foreach ($edit as $name => $value) {
+        variable_set($name, $value);
+      }
     }
     drupal_set_message(t('The configuration options have been saved.'));
   }
   else {
     return;
   }
-
   cache_clear_all();
   menu_rebuild();
   drupal_goto($_GET['q']);