diff options
| -rw-r--r-- | install.php | 1 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/common.test | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/install.php b/install.php index 3b6dd1848..c30b302d6 100644 --- a/install.php +++ b/install.php @@ -271,7 +271,6 @@ function install_settings_form(&$form_state, $profile, $install_locale, $setting '#default_value' => empty($database['username']) ? '' : $database['username'], '#size' => 45, '#maxlength' => 45, - '#required' => TRUE, ); // Database username diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index ce900b047..d76e1fee4 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -477,8 +477,8 @@ function aggregator_save_feed($edit) { foreach ($edit['category'] as $cid => $value) { if ($value) { db_merge('aggregator_category_feed') + ->key(array('fid' => $edit['fid'])) ->fields(array( - 'fid' => $edit['fid'], 'cid' => $cid, )) ->execute(); diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index c2eaad4d3..62cfdb108 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -475,7 +475,8 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase { $this->assertErrorMessage('Exception', 'system_test.module', 'system_test_trigger_exception()', 'Drupal is awesome'); $this->drupalGet('system-test/trigger-pdo-exception'); - $this->assertErrorMessage('PDOException', 'system_test.module', 'system_test_trigger_pdo_exception()', 'Base table or view not found'); + // We only check for SQLSTATE because the exact error reported varies from database to database. + $this->assertErrorMessage('PDOException', 'system_test.module', 'system_test_trigger_pdo_exception()', 'SQLSTATE'); } /** |