? 6-validate.patch ? 6-x-conf-ignore.patch ? 63220-generate.patch ? 632438-views.patch ? 685872-pgsql-b.patch Index: domain.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v retrieving revision 1.41 diff -u -p -r1.41 domain.admin.inc --- domain.admin.inc 1 Nov 2009 18:20:19 -0000 1.41 +++ domain.admin.inc 16 Jan 2010 17:47:37 -0000 @@ -981,11 +981,11 @@ function domain_batch_form_submit($form, if (isset($data['settings'])) { $settings = unserialize($data['settings']); $settings[$item] = $value; - db_query("UPDATE {domain_conf} SET settings = %b WHERE domain_id = %d", serialize($settings), $key); + db_query("UPDATE {domain_conf} SET settings = '%s' WHERE domain_id = %d", serialize($settings), $key); } else { $settings[$item] = $value; - db_query("INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, %b)", $key, serialize($settings)); + db_query("INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, '%s')", $key, serialize($settings)); } } else if (!empty($form_state['values']['variable'])) { Index: domain_conf/domain_conf.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.admin.inc,v retrieving revision 1.14 diff -u -p -r1.14 domain_conf.admin.inc --- domain_conf/domain_conf.admin.inc 23 Oct 2009 16:33:21 -0000 1.14 +++ domain_conf/domain_conf.admin.inc 16 Jan 2010 17:47:40 -0000 @@ -163,11 +163,11 @@ function domain_conf_form_submit($form, $check = 0; $check = db_result(db_query("SELECT COUNT(domain_id) FROM {domain_conf} WHERE domain_id = %d", $form_state['values']['domain_id'])); if ($check > 0) { - $sql = "UPDATE {domain_conf} SET settings = %b WHERE domain_id = %d"; + $sql = "UPDATE {domain_conf} SET settings = '%s' WHERE domain_id = %d"; db_query($sql, serialize($settings), $form_state['values']['domain_id']); } else { - $sql = "INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, %b)"; + $sql = "INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, '%s')"; db_query($sql, $form_state['values']['domain_id'], serialize($settings)); } drupal_set_message(t('Domain options saved successfully.')); Index: domain_conf/domain_conf.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v retrieving revision 1.53 diff -u -p -r1.53 domain_conf.module --- domain_conf/domain_conf.module 1 Nov 2009 18:20:19 -0000 1.53 +++ domain_conf/domain_conf.module 16 Jan 2010 17:47:41 -0000 @@ -600,11 +600,11 @@ function domain_conf_variable_set($domai // Settings found, update them. if (!empty($settings)) { $settings[$variable] = $value; - db_query("UPDATE {domain_conf} SET settings = %b WHERE domain_id = %d", serialize($settings), $domain_id); + db_query("UPDATE {domain_conf} SET settings = '%s' WHERE domain_id = %d", serialize($settings), $domain_id); } else if (domain_lookup($domain_id) != -1) { $settings = array($variable => $value); - db_query("INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, %b)", $domain_id, serialize($settings)); + db_query("INSERT INTO {domain_conf} (domain_id, settings) VALUES (%d, '%s')", $domain_id, serialize($settings)); } // Clear the cache. cache_clear_all('variables', 'cache'); Index: domain_theme/domain_theme.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_theme/Attic/domain_theme.admin.inc,v retrieving revision 1.9 diff -u -p -r1.9 domain_theme.admin.inc --- domain_theme/domain_theme.admin.inc 11 Oct 2009 14:19:25 -0000 1.9 +++ domain_theme/domain_theme.admin.inc 16 Jan 2010 17:47:42 -0000 @@ -183,7 +183,7 @@ function domain_theme_submit($form, &$fo db_query("UPDATE {domain_theme} SET status = 0 WHERE domain_id = %d", $domain_id); $check = domain_theme_lookup($domain_id, $theme); if ($check == -1) { - db_query("INSERT INTO {domain_theme} (domain_id, theme, settings, status) VALUES (%d, '%s', %b, 1)", $domain_id, $theme, $settings); + db_query("INSERT INTO {domain_theme} (domain_id, theme, settings, status) VALUES (%d, '%s', '%s', 1)", $domain_id, $theme, $settings); } else { db_query("UPDATE {domain_theme} SET status = 1 WHERE domain_id = %d AND theme = '%s'", $domain_id, $theme); @@ -340,10 +340,10 @@ function domain_theme_settings_submit($f unset($values['var'], $values['submit'], $values['reset'], $values['form_id'], $values['op'], $values['form_build_id'], $values['form_token'], $values['domain_id'], $values['domain_color'], $values['domain_color_defaults']); $settings = serialize($values); if ($check > 0) { - db_query("UPDATE {domain_theme} SET settings = %b, filepath = '%s' WHERE domain_id = %d AND theme = '%s'", $settings, $filepath, $domain_id, $theme); + db_query("UPDATE {domain_theme} SET settings = '%s', filepath = '%s' WHERE domain_id = %d AND theme = '%s'", $settings, $filepath, $domain_id, $theme); } else { - db_query("INSERT INTO {domain_theme} (domain_id, theme, settings, status, filepath) VALUES (%d, '%s', %b, 0, '%s')", $domain_id, $theme, $settings, $filepath); + db_query("INSERT INTO {domain_theme} (domain_id, theme, settings, status, filepath) VALUES (%d, '%s', '%s', 0, '%s')", $domain_id, $theme, $settings, $filepath); } drupal_set_message(t('The configuration options have been saved.')); }