Commit 796145ad authored by Dries's avatar Dries

- Patch #62016 by chx: made the clean URL test work properly.

parent 7817781c
...@@ -290,7 +290,7 @@ function system_view_general() { ...@@ -290,7 +290,7 @@ function system_view_general() {
if (!variable_get('clean_url', 0)) { if (!variable_get('clean_url', 0)) {
if (strpos(request_uri(), '?q=') !== FALSE) { if (strpos(request_uri(), '?q=') !== FALSE) {
$form['general']['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The <a href="%handbook">handbook page on Clean URLs</a> has additional troubleshooting information. %run-test', array('%handbook' => 'http://drupal.org/node/15365', '%run-test' => '<a href ="'. str_replace('?q=', '', url('admin/settings')) .'">'. t('Run the clean URL test') .'</a>')); $form['general']['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The <a href="%handbook">handbook page on Clean URLs</a> has additional troubleshooting information. %run-test', array('%handbook' => 'http://drupal.org/node/15365', '%run-test' => '<a href ="'. base_path() . 'admin/settings">'. t('Run the clean URL test') .'</a>'));
$form['general']['clean_url']['#attributes'] = array('disabled' => 'disabled'); $form['general']['clean_url']['#attributes'] = array('disabled' => 'disabled');
} }
else { else {
......
...@@ -290,7 +290,7 @@ function system_view_general() { ...@@ -290,7 +290,7 @@ function system_view_general() {
if (!variable_get('clean_url', 0)) { if (!variable_get('clean_url', 0)) {
if (strpos(request_uri(), '?q=') !== FALSE) { if (strpos(request_uri(), '?q=') !== FALSE) {
$form['general']['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The <a href="%handbook">handbook page on Clean URLs</a> has additional troubleshooting information. %run-test', array('%handbook' => 'http://drupal.org/node/15365', '%run-test' => '<a href ="'. str_replace('?q=', '', url('admin/settings')) .'">'. t('Run the clean URL test') .'</a>')); $form['general']['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The <a href="%handbook">handbook page on Clean URLs</a> has additional troubleshooting information. %run-test', array('%handbook' => 'http://drupal.org/node/15365', '%run-test' => '<a href ="'. base_path() . 'admin/settings">'. t('Run the clean URL test') .'</a>'));
$form['general']['clean_url']['#attributes'] = array('disabled' => 'disabled'); $form['general']['clean_url']['#attributes'] = array('disabled' => 'disabled');
} }
else { else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment