diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | modules/system/system.test | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 1c787f13f..fd383c765 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1727,7 +1727,7 @@ function system_update_6017() { $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)"); $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)"); if ($old_name == 'user_mail_approval_body') { - drupal_set_message('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the <a href="' . url('admin/user/settings') . '">User settings</a> page for details.'); + drupal_set_message('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the <a href="' . url('admin/settings/user') . '">User settings</a> page for details.'); } } } diff --git a/modules/system/system.test b/modules/system/system.test index 46cafc001..17c76a65a 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -454,8 +454,8 @@ class AdminOverviewTestCase extends DrupalWebTestCase { $this->assertLink(t('Content management')); // Make sure menu items without children are hidden. - $this->assertNoLink(t('Site building')); $this->assertNoLink(t('Site configuration')); + $this->assertNoLink(t('Site building')); $this->assertNoLink(t('User management')); $this->assertNoLink(t('Reports')); } @@ -518,7 +518,11 @@ class AccessDeniedTestCase extends DrupalWebTestCase { $edit = array( 'title' => $this->randomName(10), +<<<<<<< system.test + NODE_BODY_FIELD => array(array('value' => $this->randomName(100))), +======= 'body' => array(array('value' => $this->randomName(100))), +>>>>>>> 1.47 ); $node = $this->drupalCreateNode($edit); @@ -579,7 +583,11 @@ class PageNotFoundTestCase extends DrupalWebTestCase { $edit = array( 'title' => $this->randomName(10), +<<<<<<< system.test + NODE_BODY_FIELD => array(array('value' => $this->randomName(100))), +======= 'body' => array(array('value' => $this->randomName(100))), +>>>>>>> 1.47 ); $node = $this->drupalCreateNode($edit); @@ -705,7 +713,11 @@ class PageTitleFiltering extends DrupalWebTestCase { // Generate node content. $edit = array( 'title' => '!SimpleTest! ' . $title . $this->randomName(20), +<<<<<<< system.test + NODE_BODY_FIELD . '[0][value]' => '!SimpleTest! test body' . $this->randomName(200), +======= 'body[0][value]' => '!SimpleTest! test body' . $this->randomName(200), +>>>>>>> 1.47 ); // Create the node with HTML in the title. $this->drupalPost('node/add/page', $edit, t('Save')); |