From ee8aa910b9db2f90bfb46ba852eaa349343d5e04 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 21 Sep 2009 06:44:14 +0000
Subject: Patch #579366 by sun, litwol | chx, Dries: simplified form API
 redirection handling. I can actually understand it now. ;-).

---
 modules/system/system.admin.inc | 4 ++--
 modules/system/system.test      | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 48806cdb4..2d8c81713 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1822,7 +1822,7 @@ function system_site_maintenance_mode() {
  * @ingroup forms
  * @see system_settings_form()
  */
-function system_clean_url_settings($form) {
+function system_clean_url_settings($form, &$form_state) {
   global $base_url;
 
   // When accessing this form using a non-clean URL, allow a re-check to make
@@ -1852,7 +1852,7 @@ function system_clean_url_settings($form) {
   else {
     drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
 
-    $form['#redirect'] = $base_url . '/admin/config/search/clean-urls';
+    $form_state['redirect'] = $base_url . '/admin/config/search/clean-urls';
     $form['clean_url_description'] = array(
       '#type' => 'markup',
       '#markup' => '<p>' . t('Use URLs like <code>example.com/user</code> instead of <code>example.com/?q=user</code>.') . ' ' . t('If you are directed to a <em>Page not found (404)</em> error after testing for clean URLs, see the <a href="@handbook">online handbook</a>.', array('@handbook' => 'http://drupal.org/node/15365')) . '</p>',
diff --git a/modules/system/system.test b/modules/system/system.test
index d6fd1a98e..6d1e4d142 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -512,20 +512,14 @@ class AdminMetaTagTestCase extends DrupalWebTestCase {
 class AccessDeniedTestCase extends DrupalWebTestCase {
   protected $admin_user;
 
-  /**
-   * Implement getInfo().
-   */
   public static function getInfo() {
     return array(
       'name' => '403 functionality',
-      'description' => "Tests page access denied functionality, including custom 403 pages.",
+      'description' => 'Tests page access denied functionality, including custom 403 pages.',
       'group' => 'System'
     );
   }
 
-  /**
-   * Implement setUp().
-   */
   function setUp() {
     parent::setUp();
 
-- 
cgit v1.2.3