summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-05-15 06:09:57 +0000
committerDries Buytaert <dries@buytaert.net>2006-05-15 06:09:57 +0000
commit796145ad388cca3004f832e9bd5931194c9b62ca (patch)
tree49302dba07ea206e1a2ace5449c4cfb072b3e5dc
parent7817781c73febc00521407fc8b6c267ba2a6f4e1 (diff)
downloadbrdo-796145ad388cca3004f832e9bd5931194c9b62ca.tar.gz
brdo-796145ad388cca3004f832e9bd5931194c9b62ca.tar.bz2
- Patch #62016 by chx: made the clean URL test work properly.
-rw-r--r--modules/system.module2
-rw-r--r--modules/system/system.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/system.module b/modules/system.module
index 249c06e1d..17aa467bc 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -290,7 +290,7 @@ function system_view_general() {
if (!variable_get('clean_url', 0)) {
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');
}
else {
diff --git a/modules/system/system.module b/modules/system/system.module
index 249c06e1d..17aa467bc 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -290,7 +290,7 @@ function system_view_general() {
if (!variable_get('clean_url', 0)) {
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');
}
else {