diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index b56f3cf..a69c703 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -106,7 +106,7 @@ public function submitForm(array &$form, array &$form_state) { system_date_format_delete($this->formatID); drupal_set_message(t('Removed date format %format.', array('%format' => $this->format['name']))); - $form_state['redirect'] = 'admin/config/regional/date-time/formats'; + $form_state['redirect'] = 'admin/config/regional/date-time'; } } diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php index c867581..3c3b257 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php @@ -78,7 +78,7 @@ function testTimeZoneHandling() { */ function testDateFormatConfiguration() { // Confirm 'no custom date formats available' message appears. - $this->drupalGet('admin/config/regional/date-time/formats'); + $this->drupalGet('admin/config/regional/date-time'); // Add custom date format. $this->clickLink(t('Add format')); @@ -91,25 +91,25 @@ function testDateFormatConfiguration() { 'date_format_pattern' => $date_format, ); $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Date format added confirmation message appears.'); $this->assertText($date_format_id, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); // Edit custom date format. - $this->drupalGet('admin/config/regional/date-time/formats'); + $this->drupalGet('admin/config/regional/date-time'); $this->clickLink(t('Edit')); $edit = array( 'date_format_pattern' => 'Y m', ); $this->drupalPost($this->getUrl(), $edit, t('Save format')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.'); // Delete custom date format. $this->clickLink(t('Delete')); $this->drupalPost('admin/config/regional/date-time/formats/' . $date_format_id . '/delete', array(), t('Remove')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); $this->assertText(t('Removed date format ' . $name), 'Custom date format removed.'); // Make sure the date does not exist in config.